From c4070c6f43c2128fa068d8ae74b178a0b4677e3a Mon Sep 17 00:00:00 2001 From: Lee Spector Date: Wed, 11 Oct 2023 19:37:10 -0400 Subject: [PATCH] Set up mul3 defaults for :ah-umad; note hack to :instructions --- src/propeller/problems/boolean/mul3.cljc | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/propeller/problems/boolean/mul3.cljc b/src/propeller/problems/boolean/mul3.cljc index 94a6281..5989acd 100644 --- a/src/propeller/problems/boolean/mul3.cljc +++ b/src/propeller/problems/boolean/mul3.cljc @@ -298,7 +298,7 @@ [& args] (gp/gp (merge - {:instructions instructions + {:instructions (concat instructions [:vary :protect]) ;; ah-umad :error-function error-function :training-data (:train train-and-test-data) :testing-data (:test train-and-test-data) @@ -311,17 +311,20 @@ ;:parent-selection :motley-batch-lexicase ;:max-batch-size [1 2 4 8 16 32 64 128 256] ;:tournament-size 5 - :umad-rate [1/2 - 1/4 1/4 - 1/8 1/8 1/8 - 1/16 1/16 1/16 1/16 - 1/32 1/32 1/32 1/32 1/32 - 1/64 1/64 1/64 1/64 1/64 1/64 - 1/128 1/128 1/128 1/128 1/128 1/128 1/128 - 1/256 1/256 1/256 1/256 1/256 1/256 1/256 1/256] + :umad-rate 0.001 ;; ah-umad + :ah-umad-rate 0.1 ;; ah-umad + ;:umad-rate [1/2 + ; 1/4 1/4 + ; 1/8 1/8 1/8 + ; 1/16 1/16 1/16 1/16 + ; 1/32 1/32 1/32 1/32 1/32 + ; 1/64 1/64 1/64 1/64 1/64 1/64 + ; 1/128 1/128 1/128 1/128 1/128 1/128 1/128 + ; 1/256 1/256 1/256 1/256 1/256 1/256 1/256 1/256] ;:alternation-rate [1 1/2 1/4 1/8 1/16 1/32 1/64 1/128 1/256] ;:alignment-deviation [0 1 2 4 8 16 32 64 128] - :variation {:umad 1 + :variation {:ah-umad 1 ;; ah-umad + :umad 0 :alternation 0 :reproduction 0 :tail-aligned-crossover 0}