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

autosimplification implementation complete

Browse Source
This commit is contained in:
Ryan Boldi 2022-02-26 21:11:38 -05:00
parent af22f9793b
commit f1838b6b32
2 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/propeller/gp.cljc
View File

@ -61,7 +61,7 @@
(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))})
(if (:simplification? argmap) (if (:simplification? argmap)
(let [simplified-plushy (simplification/auto-simplify-plushy argmap (:plushy best-individual) (:simplification-steps argmap) error-function (:training-data argmap) (:simplification-k argmap) (:simplification-verbose? argmap))] (let [simplified-plushy (simplification/auto-simplify-plushy argmap (:plushy best-individual) (:simplification-steps argmap) error-function (:training-data argmap) (:simplification-k argmap) (:simplification-k-prob argmap) (:simplification-verbose? 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)))}))))
;; ;;
(>= generation max-generations) (>= generation max-generations)

35
src/propeller/problems/simple_regression.cljc
View File

@ -66,25 +66,18 @@
[& args] [& args]
(gp/gp (gp/gp
(merge (merge
{:instructions instructions {:instructions instructions
:error-function error-function :error-function error-function
:training-data (:train train-and-test-data) :training-data (:train train-and-test-data)
:testing-data (:test train-and-test-data) :testing-data (:test train-and-test-data)
:max-generations 500 :max-generations 500
:population-size 500 :population-size 500
:max-initial-plushy-size 100 :max-initial-plushy-size 100
:step-limit 200 :step-limit 200
:parent-selection :lexicase :parent-selection :lexicase
:case-queue? false :tournament-size 5
:case-step 1 :umad-rate 0.1
:downsample-size 10 :variation {:umad 0.5 :crossover 0.5}
:tournament-size 5 :elitism false}
:umad-rate 0.1 (apply hash-map (map #(if (string? %) (read-string %) %) args))))
:variation {:umad 0.5 :crossover 0.5}
:elitism false
:simplification? true
:simplification-steps 100
:simplification-k 5
:simplification-verbose? true}
(apply hash-map (map #(if (string? %) (read-string %) %) args))))
(#?(:clj shutdown-agents))) (#?(:clj shutdown-agents)))