From 33370070ace4ba90aff25a99cf1d557037a9f244 Mon Sep 17 00:00:00 2001 From: Tom Helmuth Date: Sun, 7 Feb 2021 09:34:30 -0500 Subject: [PATCH] Fixed bugs accidentally introduced to Coin Sums and Find Pair --- src/clojush/problems/software/benchmarks_v2/coin_sums.clj | 7 +++---- src/clojush/problems/software/benchmarks_v2/find_pair.clj | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/clojush/problems/software/benchmarks_v2/coin_sums.clj b/src/clojush/problems/software/benchmarks_v2/coin_sums.clj index 8cb36c87..655b7d04 100644 --- a/src/clojush/problems/software/benchmarks_v2/coin_sums.clj +++ b/src/clojush/problems/software/benchmarks_v2/coin_sums.clj @@ -195,6 +195,7 @@ {:error-function (make-coin-sums-error-function-from-cases (first coin-sums-train-and-test-cases) (second coin-sums-train-and-test-cases)) :training-cases (first coin-sums-train-and-test-cases) + :atom-generators coin-sums-atom-generators :max-points 2000 :max-genome-size-in-initial-program 250 :evalpush-limit 2000 @@ -204,8 +205,7 @@ :genetic-operator-probabilities {:alternation 0.2 :uniform-mutation 0.2 :uniform-close-mutation 0.1 - [:alternation :uniform-mutation] 0.5 - } + [:alternation :uniform-mutation] 0.5} :alternation-rate 0.01 :alignment-deviation 10 :uniform-mutation-rate 0.01 @@ -213,5 +213,4 @@ :problem-specific-initial-report coin-sums-initial-report :report-simplifications 0 :final-report-simplifications 5000 - :max-error 1000000 - }) + :max-error 1000000}) diff --git a/src/clojush/problems/software/benchmarks_v2/find_pair.clj b/src/clojush/problems/software/benchmarks_v2/find_pair.clj index 5398540b..97cfa9ab 100644 --- a/src/clojush/problems/software/benchmarks_v2/find_pair.clj +++ b/src/clojush/problems/software/benchmarks_v2/find_pair.clj @@ -211,6 +211,7 @@ {: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 :evalpush-limit 2000