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

Call shutdown-agents at end of run; reformat

Browse Source
This commit is contained in:
Lee Spector 2023-10-19 10:53:13 -04:00
parent e3ba58587a
commit b6e7b0e86f
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/propeller/gp.cljc
View File

@ -75,16 +75,16 @@
; parent representatives for down-sampling ; parent representatives for down-sampling
rep-evaluated-pop (if downsample? rep-evaluated-pop (if downsample?
(sort-by :total-error (sort-by :total-error
(utils/pmapallv (utils/pmapallv
(partial error-function argmap indexed-training-data) (partial error-function argmap indexed-training-data)
parent-reps parent-reps
argmap)) argmap))
'()) '())
evaluated-pop (sort-by :total-error evaluated-pop (sort-by :total-error
(utils/pmapallv (utils/pmapallv
(partial error-function argmap training-data) (partial error-function argmap training-data)
population population
argmap)) argmap))
best-individual (first evaluated-pop) best-individual (first evaluated-pop)
best-individual-passes-ds (and downsample? (<= (:total-error best-individual) solution-error-threshold)) best-individual-passes-ds (and downsample? (<= (:total-error best-individual) solution-error-threshold))
argmap (if (= (:parent-selection argmap) :epsilon-lexicase) argmap (if (= (:parent-selection argmap) :epsilon-lexicase)
@ -100,16 +100,16 @@
;; If either the best individual on the ds passes all training cases, or best individual on full sample passes all training cases ;; If either the best individual on the ds passes all training cases, or best individual on full sample passes all training cases
;; We verify success on test cases and end evolution ;; We verify success on test cases and end evolution
(if (or (and best-individual-passes-ds (<= (:total-error (error-function argmap indexed-training-data best-individual)) solution-error-threshold)) (if (or (and best-individual-passes-ds (<= (:total-error (error-function argmap indexed-training-data best-individual)) solution-error-threshold))
(and (not downsample?) (and (not downsample?)
(<= (:total-error best-individual) solution-error-threshold))) (<= (:total-error best-individual) solution-error-threshold)))
(do (prn {:success-generation generation}) (do (prn {:success-generation generation})
(prn {:total-test-error (prn {:total-test-error
(:total-error (error-function argmap (:testing-data argmap) best-individual))}) (:total-error (error-function argmap (:testing-data argmap) best-individual))})
(when (:simplification? argmap) (when (:simplification? argmap)
(let [simplified-plushy (simplification/auto-simplify-plushy (:plushy best-individual) error-function argmap)] (let [simplified-plushy (simplification/auto-simplify-plushy (:plushy best-individual) error-function argmap)]
(prn {:total-test-error-simplified (:total-error (error-function argmap (:testing-data argmap) (hash-map :plushy simplified-plushy)))}))) (prn {:total-test-error-simplified (:total-error (error-function argmap (:testing-data argmap) (hash-map :plushy simplified-plushy)))})))
(if dont-end false true)) (if dont-end false true))
false) false)
nil nil
;; ;;
(and (not downsample?) (>= generation max-generations)) (and (not downsample?) (>= generation max-generations))
@ -133,7 +133,8 @@
(range population-size) (range population-size)
argmap)))) argmap))))
(if downsample? (if downsample?
(if (zero? (mod generation ds-parent-gens)) (if (zero? (mod generation ds-parent-gens))
(downsample/update-case-distances rep-evaluated-pop indexed-training-data indexed-training-data ids-type (/ solution-error-threshold (count indexed-training-data))) ; update distances every ds-parent-gens generations (downsample/update-case-distances rep-evaluated-pop indexed-training-data indexed-training-data ids-type (/ solution-error-threshold (count indexed-training-data))) ; update distances every ds-parent-gens generations
indexed-training-data) indexed-training-data)
indexed-training-data)))))) indexed-training-data))))
#?(:clj (shutdown-agents))))