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

Add and strip :gene for bmx-umad

Browse Source
This commit is contained in:
Lee Spector 2023-11-25 11:33:36 -05:00
parent 770dfe74b1
commit 5c127ef21b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/propeller/genome.cljc
View File

@ -49,7 +49,8 @@ They hold the genetic material for an `individual`. In the initial population, w
;; call plushy->push-internal with possibly-preprocessed plushy ;; call plushy->push-internal with possibly-preprocessed plushy
([plushy argmap] ([plushy argmap]
(plushy->push-internal (if (or (> (or (:ah-umad (:variation argmap)) 0) 0) ;; must strip :vary and :protect (plushy->push-internal (if (or (> (or (:ah-umad (:variation argmap)) 0) 0) ;; must strip :vary and :protect
(> (or (:bmx (:variation argmap)) 0) 0)) ;; must strip :gene (> (or (:bmx (:variation argmap)) 0) 0) ;; must strip :gene
(> (or (:bmx-umad (:variation argmap)) 0) 0)) ;; must strip :gene
(filter (complement #{:vary :protect :gene}) plushy) (filter (complement #{:vary :protect :gene}) plushy)
plushy) plushy)
argmap))) argmap)))

6
src/propeller/gp.cljc
View File

@ -179,9 +179,11 @@
[argmap] [argmap]
(let [adjust-for-bmx (let [adjust-for-bmx
(fn [args] (fn [args]
(let [prob (:bmx (:variation args)) (let [prob-bmx (:bmx (:variation args))
prob-bmx-umad (:bmx-umad (:variation args))
n (:bmx-enrichment args)] n (:bmx-enrichment args)]
(if (and prob (> prob 0)) (if (or (and prob-bmx (> prob-bmx 0))
(and prob-bmx-umad (> prob-bmx-umad 0)))
(update args :instructions concat (repeat (or n 1) :gene)) (update args :instructions concat (repeat (or n 1) :gene))
args))) args)))
; ;