Fix :flip that should be :diploid-flip
This commit is contained in:
parent
81f2c3197f
commit
0c6ebde41b
@ -35,13 +35,6 @@
|
|||||||
[state stack]
|
[state stack]
|
||||||
(empty? (get state stack)))
|
(empty? (get state stack)))
|
||||||
|
|
||||||
;;; Returns the top item on the stack
|
|
||||||
;(defn peek-stack
|
|
||||||
; [state stack]
|
|
||||||
; (if-let [top-item (first (get state stack))]
|
|
||||||
; top-item
|
|
||||||
; :no-stack-item))
|
|
||||||
|
|
||||||
;; Returns the top item on the stack
|
;; Returns the top item on the stack
|
||||||
(defn peek-stack
|
(defn peek-stack
|
||||||
[state stack]
|
[state stack]
|
||||||
|
@ -86,7 +86,7 @@
|
|||||||
[crossover uniform-addition uniform-deletion])
|
[crossover uniform-addition uniform-deletion])
|
||||||
xover-prob (or (:crossover (:variation argmap)) 0)
|
xover-prob (or (:crossover (:variation argmap)) 0)
|
||||||
umad-prob (or (:umad (:variation argmap)) 0)
|
umad-prob (or (:umad (:variation argmap)) 0)
|
||||||
flip-prob (or (:flip (:variation argmap)) 0)]
|
flip-prob (or (:diploid-flip (:variation argmap)) 0)]
|
||||||
(cond
|
(cond
|
||||||
(< prob xover-prob)
|
(< prob xover-prob)
|
||||||
(xover (:plushy (selection/select-parent pop argmap))
|
(xover (:plushy (selection/select-parent pop argmap))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user