Merge pull request #31 from dafg05/custom-report

Fix null-custom report bug when no custom-report is passed to gp argmap
This commit is contained in:
Lee Spector 2021-08-02 11:42:31 -04:00 committed by GitHub
commit 5b2b9c82a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -31,7 +31,7 @@
(defn gp
"Main GP loop."
[{:keys [population-size max-generations error-function instructions
max-initial-plushy-size custom-report]
max-initial-plushy-size]
:as argmap}]
;;
(prn {:starting-args (update (update argmap :error-function str) :instructions str)})
@ -49,8 +49,8 @@
(partial error-function argmap (:training-data argmap))
population))
best-individual (first evaluated-pop)]
(if (custom-report argmap)
((custom-report argmap) evaluated-pop generation argmap)
(if (:custom-report argmap)
((:custom-report argmap) evaluated-pop generation argmap)
(report evaluated-pop generation argmap))
(cond
;; Success on training cases is verified on testing cases