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

Allow collection for :max-batch-size

Browse Source
This commit is contained in:
Lee Spector 2023-09-05 10:44:50 -04:00
parent 65c7f2a3fe
commit 7dcf75c433
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/propeller/problems/boolean/mul3.cljc
View File

@ -303,22 +303,28 @@
:training-data (:train train-and-test-data)
:testing-data (:test train-and-test-data)
:max-generations 1000
:population-size 500
:population-size 100
:max-initial-plushy-size 100
:step-limit 1000
;:parent-selection :lexicase
:parent-selection :lexicase
;:parent-selection :tournament
:parent-selection :motley-batch-lexicase
:max-batch-size 8
;:parent-selection :motley-batch-lexicase
;:max-batch-size [1 2 4 8 16 32 64 128 256]
;:tournament-size 5
:umad-rate [1/64 1/128 1/256]
;:alternation-rate [1/64 1/128 1/256]
;:alignment-deviation [0 4 16 64]
: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
:alternation 0
:reproduction 0
:tail-aligned-crossover 0
}
:tail-aligned-crossover 0}
;:diploid true
;:variation {:diploid-vumad 0.8
; :diploid-uniform-silent-replacement 0.1

5
src/propeller/selection.cljc
View File

@ -2,7 +2,8 @@
"Propeller includes many kinds of genetic operators to select parents within the population such as tournament selection,
lexicase selection, and epsilon lexicase selection."
{:doc/format :markdown}
(:require [propeller.tools.math :as math-tools]))
(:require [propeller.tools.math :as math-tools]
[propeller.utils :as utils]))
(defn tournament-selection
"Selects an individual from the population using tournaments of
@ -38,7 +39,7 @@
(if (or (empty? cases)
(empty? (rest survivors)))
(rand-nth survivors)
(let [batch-size (inc (rand-int (:max-batch-size argmap)))
(let [batch-size (inc (rand-int (utils/onenum (:max-batch-size argmap))))
batch (take batch-size cases)
ind-err-pairs (map (fn [ind]
[ind