Fix null-custom report bug when no custom-report is passed to gp

This commit is contained in:
Daniel Flores García 2021-08-02 10:52:41 -04:00
parent 12d5ffd522
commit 393f2368f2

View File

@ -31,7 +31,7 @@
(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 custom-report] max-initial-plushy-size]
: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)})
@ -49,8 +49,8 @@
(partial error-function argmap (:training-data argmap)) (partial error-function argmap (:training-data argmap))
population)) population))
best-individual (first evaluated-pop)] best-individual (first evaluated-pop)]
(if (custom-report argmap) (if (:custom-report argmap)
((custom-report argmap) evaluated-pop generation argmap) ((:custom-report argmap) evaluated-pop generation argmap)
(report evaluated-pop generation argmap)) (report evaluated-pop generation argmap))
(cond (cond
;; Success on training cases is verified on testing cases ;; Success on training cases is verified on testing cases