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

evaluate all distances every k generations

Browse Source
This commit is contained in:
Ryan Boldi 2022-03-16 11:07:08 -04:00
parent 9b81e345df
commit b33ac7c0a4
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/propeller/gp.cljc
View File

@ -48,10 +48,14 @@
(fn [_] {:plushy (genome/make-random-plushy instructions max-initial-plushy-size)}) (fn [_] {:plushy (genome/make-random-plushy instructions max-initial-plushy-size)})
(range population-size)) (range population-size))
indexed-training-data (downsample/assign-indices-to-data (downsample/initialize-case-distances argmap))] indexed-training-data (downsample/assign-indices-to-data (downsample/initialize-case-distances argmap))]
;;TODO: REMOVE THIS IT IS JUST FOR TESTING
(prn {:data (some #(when (zero? (:index %)) %) indexed-training-data)})
(let [training-data (if (= (:parent-selection argmap) :ds-lexicase) (let [training-data (if (= (:parent-selection argmap) :ds-lexicase)
(case (:ds-function argmap) (if (zero? (mod generation (:case-k argmap))) ;every k generations, we eval on the entire training set
:case-tournament (downsample/select-downsample-tournament indexed-training-data argmap) indexed-training-data
(downsample/select-downsample-random indexed-training-data argmap)) ;defaults to random (case (:ds-function argmap)
:case-tournament (downsample/select-downsample-tournament indexed-training-data argmap)
(downsample/select-downsample-random indexed-training-data argmap))) ;defaults to random
indexed-training-data) indexed-training-data)
evaluated-pop (sort-by :total-error evaluated-pop (sort-by :total-error
(mapper (mapper
@ -96,5 +100,7 @@
(repeatedly population-size (repeatedly population-size
#(variation/new-individual evaluated-pop argmap))) #(variation/new-individual evaluated-pop argmap)))
(if (= (:parent-selection argmap) :ds-lexicase) (if (= (:parent-selection argmap) :ds-lexicase)
(downsample/update-case-distances evaluated-pop training-data indexed-training-data) (if (zero? (mod generation (:case-k argmap)))
(downsample/update-case-distances evaluated-pop training-data indexed-training-data) ; update distances every k generations
indexed-training-data)
indexed-training-data)))))) indexed-training-data))))))