From 81f2c3197fd0c79327586ff090bbfb8bcd76111a Mon Sep 17 00:00:00 2001 From: Lee Spector Date: Sun, 29 Nov 2020 21:32:42 -0500 Subject: [PATCH] Distinguish flip rate from flip probability --- src/propeller/session.cljc | 63 +++++++++++++++++++----------------- src/propeller/variation.cljc | 3 +- 2 files changed, 35 insertions(+), 31 deletions(-) diff --git a/src/propeller/session.cljc b/src/propeller/session.cljc index 38057a6..9c54e98 100755 --- a/src/propeller/session.cljc +++ b/src/propeller/session.cljc @@ -88,47 +88,50 @@ :elitism false}) #_(gp/gp {:instructions propeller.problems.simple-regression/instructions - :error-function propeller.problems.simple-regression/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 - :variation {:umad 0.8 - :flip 0.2} - :elitism false - :diploid true}) + :error-function propeller.problems.simple-regression/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} + :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 :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 - :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 + :max-initial-plushy-size 200 ;100 :step-limit 200 :parent-selection :lexicase :tournament-size 5 :umad-rate 0.1 + :diploid-flip-rate 0.1 :variation {:umad 0.8 - :flip 0.2 + :diploid-flip 0.2 ;:umad 1 } :elitism false diff --git a/src/propeller/variation.cljc b/src/propeller/variation.cljc index 8b98f18..3088c62 100755 --- a/src/propeller/variation.cljc +++ b/src/propeller/variation.cljc @@ -99,6 +99,7 @@ (:umad-rate argmap)) ; (< 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))))})