git merge conflicts resolved
This commit is contained in:
commit
660fb32d93
@ -37,7 +37,7 @@
|
|||||||
max-initial-plushy-size PSB2-path PSB2-problem]
|
max-initial-plushy-size PSB2-path PSB2-problem]
|
||||||
:as argmap}]
|
:as argmap}]
|
||||||
;;
|
;;
|
||||||
(println {:starting-args argmap})
|
(prn {:starting-args (update (update argmap :error-function str) :instructions str)})
|
||||||
(println)
|
(println)
|
||||||
;;
|
;;
|
||||||
(let [PSB2-data (if (= PSB2-path "")
|
(let [PSB2-data (if (= PSB2-path "")
|
||||||
@ -60,9 +60,10 @@
|
|||||||
(cond
|
(cond
|
||||||
;; Success on training cases is verified on testing cases
|
;; Success on training cases is verified on testing cases
|
||||||
(zero? (:total-error best-individual))
|
(zero? (:total-error best-individual))
|
||||||
(do (println {:success-generation generation})
|
(do (prn {:success-generation generation})
|
||||||
(println {:total-test-error (:total-error (error-function argmap best-individual :test))})
|
(prn {:total-test-error (:total-error (error-function argmap best-individual :test))})
|
||||||
(#?(:clj shutdown-agents)))
|
(#?(:clj shutdown-agents))
|
||||||
|
)
|
||||||
;;
|
;;
|
||||||
(>= generation max-generations)
|
(>= generation max-generations)
|
||||||
nil
|
nil
|
||||||
|
Loading…
x
Reference in New Issue
Block a user