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

Call diploid-flip when appropriate; make new-individual robust to missing rates

Browse Source
This commit is contained in:
Lee Spector 2020-11-22 21:40:57 -05:00
parent 224d33c19d
commit b6a9a410c1
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/propeller/variation.cljc
View File

@ -83,15 +83,22 @@
(let [prob (rand) (let [prob (rand)
[xover add del] (if (:diploid argmap) [xover add del] (if (:diploid argmap)
[diploid-crossover diploid-uniform-addition diploid-uniform-deletion] [diploid-crossover diploid-uniform-addition diploid-uniform-deletion]
[crossover uniform-addition uniform-deletion])] [crossover uniform-addition uniform-deletion])
xover-rate (or (:crossover (:variation argmap)) 0)
umad-rate (or (:umad (:variation argmap)) 0)
flip-rate (or (:flip (:variation argmap)) 0)]
(cond (cond
(< prob (:crossover (:variation argmap))) (< prob xover-rate)
(xover (:plushy (selection/select-parent pop argmap)) (xover (:plushy (selection/select-parent pop argmap))
(:plushy (selection/select-parent pop argmap))) (:plushy (selection/select-parent pop argmap)))
(< prob (+ (:crossover (:variation argmap)) ;
(:umad (:variation argmap)))) (< prob (+ xover-rate umad-rate))
(del (add (:plushy (selection/select-parent pop argmap)) (del (add (:plushy (selection/select-parent pop argmap))
(:instructions argmap) (:instructions argmap)
(:umad-rate argmap)) umad-rate)
(:umad-rate argmap)) umad-rate)
;
(< prob (+ xover-rate umad-rate flip-rate))
(diploid-flip (:plushy (selection/select-parent pop argmap)) flip-rate)
;
:else (:plushy (selection/select-parent pop argmap))))}) :else (:plushy (selection/select-parent pop argmap))))})