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

made variation operators user pmapallv

Browse Source
This commit is contained in:
Ryan Boldi 2023-10-15 23:10:12 -04:00
parent ce71c6d49f
commit e9a2fe9a5b
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/propeller/gp.cljc
View File

@ -51,13 +51,14 @@
(defn gp (defn gp
"Main GP loop." "Main GP loop."
[{:keys [population-size max-generations error-function instructions [{:keys [population-size max-generations error-function instructions
max-initial-plushy-size solution-error-threshold ds-parent-rate ds-parent-gens dont-end ids-type downsample?] max-initial-plushy-size solution-error-threshold ds-parent-rate ds-parent-gens dont-end ids-type downsample? hyperselection?]
:or {solution-error-threshold 0.0 :or {solution-error-threshold 0.0
dont-end false dont-end false
ds-parent-rate 0 ds-parent-rate 0
ds-parent-gens 1 ds-parent-gens 1
ids-type :solved ; :solved or :elite or :soft ids-type :solved ; :solved or :elite or :soft
downsample? false} downsample? false
hyperselection? false}
:as argmap}] :as argmap}]
;; ;;
(prn {:starting-args (update (update argmap :error-function str) :instructions str)}) (prn {:starting-args (update (update argmap :error-function str) :instructions str)})
@ -70,7 +71,7 @@
(if (:diploid argmap) (if (:diploid argmap)
(interleave plushy plushy) (interleave plushy plushy)
plushy))}) (range population-size) argmap) plushy))}) (range population-size) argmap)
indexed-training-data (downsample/assign-indices-to-data (downsample/initialize-case-distances argmap))] indexed-training-data (if downsample? (downsample/assign-indices-to-data (downsample/initialize-case-distances argmap)) (:training-data argmap))]
(let [training-data (if downsample? (let [training-data (if downsample?
(case (:ds-function argmap) (case (:ds-function argmap)
:case-maxmin (downsample/select-downsample-maxmin indexed-training-data argmap) :case-maxmin (downsample/select-downsample-maxmin indexed-training-data argmap)
@ -136,10 +137,13 @@
(let [reindexed-pop (hyperselection/reindex-pop evaluated-pop)] ; give every individual an index for hyperselection loggin (let [reindexed-pop (hyperselection/reindex-pop evaluated-pop)] ; give every individual an index for hyperselection loggin
(hyperselection/log-hyperselection-and-ret (hyperselection/log-hyperselection-and-ret
(if (:elitism argmap) (if (:elitism argmap)
(conj (repeatedly (dec population-size) #(variation/new-individual reindexed-pop argmap)) (conj (utils/pmapallv (fn [_] (variation/new-individual reindexed-pop argmap))
(first reindexed-pop)) (range (dec population-size))
(repeatedly population-size ;need to count occurance of each parent, and reset IDs argmap)
#(variation/new-individual reindexed-pop argmap))))) (first reindexed-pop)) ;elitism maintains the most-fit individual
(utils/pmapallv (fn [_] (variation/new-individual reindexed-pop argmap))
(range population-size)
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