diff --git a/src/clojush/args.clj b/src/clojush/args.clj index a2330523d..838772161 100644 --- a/src/clojush/args.clj +++ b/src/clojush/args.clj @@ -335,7 +335,7 @@ ;; The parent selection method. Options include :tournament, :lexicase, :epsilon-lexicase, ;; :elitegroup-lexicase, :uniform, :leaky-lexicase, :random-threshold-lexicase, ;; :random-toggle-lexicase, :randomly-truncated-lexicase, :truncated-lexicase, - ;; :novelty-search, :downsampled-lexcase + ;; :novelty-search, :downsampled-lexicase :epsilon-lexicase-version :semi-dynamic ;; The version of epsilon-lexicase selection to use. diff --git a/src/clojush/problems/software/benchmarks_v2/basement.clj b/src/clojush/problems/software/benchmarks_v2/basement.clj index db654bb6d..ce8731437 100644 --- a/src/clojush/problems/software/benchmarks_v2/basement.clj +++ b/src/clojush/problems/software/benchmarks_v2/basement.clj @@ -207,6 +207,7 @@ (def argmap {:error-function (make-error-function-from-cases (first train-and-test-cases) (second train-and-test-cases)) + :training-cases (first train-and-test-cases) :atom-generators atom-generators :max-points 2000 :max-genome-size-in-initial-program 250 diff --git a/src/clojush/problems/software/benchmarks_v2/middle_character.clj b/src/clojush/problems/software/benchmarks_v2/middle_character.clj index 45f30a822..c9bcb4c58 100644 --- a/src/clojush/problems/software/benchmarks_v2/middle_character.clj +++ b/src/clojush/problems/software/benchmarks_v2/middle_character.clj @@ -93,7 +93,7 @@ (for [[input1 correct-output] (case data-cases :train train-cases :test test-cases - [])] + data-cases)] (let [final-state (run-push (:program individual) (->> (make-push-state) (push-item input1 :input))) @@ -107,9 +107,11 @@ (levenshtein-distance correct-output result) 1000) ; penalty for no return value )))] - (if (= data-cases :train) - (assoc individual :behaviors @behavior :errors errors) - (assoc individual :test-errors errors)))))) + (if (= data-cases :test) + (assoc individual :test-errors errors) + (assoc individual + :behaviors (reverse @behavior) + :errors errors)))))) (defn get-train-and-test "Returns the train and test cases." @@ -156,6 +158,7 @@ (def argmap {:error-function (make-error-function-from-cases (first train-and-test-cases) (second train-and-test-cases)) + :training-cases (first train-and-test-cases) :atom-generators atom-generators :max-points 2000 :max-genome-size-in-initial-program 250 diff --git a/src/clojush/pushgp/report.clj b/src/clojush/pushgp/report.clj index 86a1fe7b0..343ddc775 100644 --- a/src/clojush/pushgp/report.clj +++ b/src/clojush/pushgp/report.clj @@ -355,7 +355,7 @@ visualize calculate-mod-metrics] :as argmap}] (r/generation-data! [:population] - (map #(dissoc % :program) population)) + (map #(dissoc % :program) population)) (println) (println ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;")