rowan.a.tl/propeller
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement complementary mate selection for :bmx and :bmx-umad, activated via ':bmx-complementary true'

Browse Source
This commit is contained in:
Lee Spector 2023-12-02 23:11:54 -05:00
parent a0bd993281
commit 2970632c26
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/propeller/variation.cljc
View File

@ -173,8 +173,16 @@ The function `new-individual` returns a new individual produced by selection and
(:plushy (selection/select-parent pop argmap)))
;
:bmx ;; best match crossover
(let [plushy1 (:plushy (selection/select-parent pop argmap))
plushy2 (:plushy (selection/select-parent pop argmap))
(let [parent1 (selection/select-parent pop argmap)
parent2 (if (:bmx-complementary argmap)
(selection/select-parent
pop
(assoc argmap
:initial-cases
(reverse (:selection-cases parent1))))
(selection/select-parent pop argmap))
plushy1 (:plushy parent1)
plushy2 (:plushy parent2)
rate (utils/onenum (or (:bmx-rate argmap) 0.5))]
(bmx plushy1 plushy2 rate))
;
@ -187,8 +195,16 @@ The function `new-individual` returns a new individual produced by selection and
;
:bmx-umad ;; applies umad to the results of bmx
(let [umad-rate (utils/onenum (:umad-rate argmap))]
(-> (let [plushy1 (:plushy (selection/select-parent pop argmap))
plushy2 (:plushy (selection/select-parent pop argmap))
(-> (let [parent1 (selection/select-parent pop argmap)
parent2 (if (:bmx-complementary argmap)
(selection/select-parent
pop
(assoc argmap
:initial-cases
(reverse (:selection-cases parent1))))
(selection/select-parent pop argmap))
plushy1 (:plushy parent1)
plushy2 (:plushy parent2)
bmx-rate (utils/onenum (or (:bmx-rate argmap) 0.5))]
(bmx plushy1 plushy2 bmx-rate))
(uniform-addition (:instructions argmap) umad-rate)