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

Distinguish flip rate from flip probability

Browse Source
This commit is contained in:
Lee Spector 2020-11-29 21:32:42 -05:00
parent 35ac379f06
commit 81f2c3197f
2 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/propeller/session.cljc
View File

@ -88,47 +88,50 @@
:elitism false}) :elitism false})
#_(gp/gp {:instructions propeller.problems.simple-regression/instructions #_(gp/gp {:instructions propeller.problems.simple-regression/instructions
:error-function propeller.problems.simple-regression/error-function :error-function propeller.problems.simple-regression/error-function
:max-generations 500 :max-generations 500
:population-size 500 :population-size 500
:max-initial-plushy-size 100 :max-initial-plushy-size 100
:step-limit 200 :step-limit 200
:parent-selection :lexicase :parent-selection :lexicase
:tournament-size 5 :tournament-size 5
:umad-rate 0.1 :umad-rate 0.1
:variation {:umad 0.8 :diploid-flip-rate 0.1
:flip 0.2} :variation {:umad 0.8
:elitism false :diploid-flip 0.2}
:diploid true}) :elitism false
:diploid true})
#_(gp/gp {:instructions propeller.problems.software.smallest/instructions
:error-function propeller.problems.software.smallest/error-function
:max-generations 500
:population-size 500
:max-initial-plushy-size 100
:step-limit 200
:parent-selection :lexicase
:tournament-size 5
:umad-rate 0.1
:diploid-flip-rate 0.1
:variation {;:umad 0.8
;:diploid-flip 0.2
:umad 1
}
:elitism false
:diploid false})
#_(gp/gp {:instructions propeller.problems.software.smallest/instructions #_(gp/gp {:instructions propeller.problems.software.smallest/instructions
:error-function propeller.problems.software.smallest/error-function :error-function propeller.problems.software.smallest/error-function
:max-generations 500 :max-generations 500
:population-size 500 :population-size 500
:max-initial-plushy-size 100 :max-initial-plushy-size 200 ;100
:step-limit 200
:parent-selection :lexicase
:tournament-size 5
:umad-rate 0.1
:variation {;:umad 0.8
;:flip 0.2
:umad 1
}
:elitism false
:diploid false})
(gp/gp {:instructions propeller.problems.software.smallest/instructions
:error-function propeller.problems.software.smallest/error-function
:max-generations 500
:population-size 500
:max-initial-plushy-size 200 ;100
:step-limit 200 :step-limit 200
:parent-selection :lexicase :parent-selection :lexicase
:tournament-size 5 :tournament-size 5
:umad-rate 0.1 :umad-rate 0.1
:diploid-flip-rate 0.1
:variation {:umad 0.8 :variation {:umad 0.8
:flip 0.2 :diploid-flip 0.2
;:umad 1 ;:umad 1
} }
:elitism false :elitism false

3
src/propeller/variation.cljc
View File

@ -99,6 +99,7 @@
(:umad-rate argmap)) (:umad-rate argmap))
; ;
(< prob (+ xover-prob umad-prob flip-prob)) (< prob (+ xover-prob umad-prob flip-prob))
(diploid-flip (:plushy (selection/select-parent pop argmap)) flip-prob) (diploid-flip (:plushy (selection/select-parent pop argmap))
(:diploid-flip-rate argmap))
; ;
:else (:plushy (selection/select-parent pop argmap))))}) :else (:plushy (selection/select-parent pop argmap))))})