diff --git a/src/propeller/gp.cljc b/src/propeller/gp.cljc index d85e930..a849a93 100755 --- a/src/propeller/gp.cljc +++ b/src/propeller/gp.cljc @@ -53,10 +53,7 @@ ;; Success on training cases is verified on testing cases (zero? (:total-error best-individual)) (do (println {:success-generation generation}) - ;(print "Checking program on test cases... ") - (if (zero? (:total-error (error-function argmap best-individual :test))) - (println {:test-cases-pass-fail 1}) - (println {:test-cases-pass-fail 0})) + (println {:total-test-error (:total-error (error-function argmap best-individual :test))}) (#?(:clj shutdown-agents)) ) ;; diff --git a/src/propeller/push/utils/globals.cljc b/src/propeller/push/utils/globals.cljc index aad494b..93477e2 100644 --- a/src/propeller/push/utils/globals.cljc +++ b/src/propeller/push/utils/globals.cljc @@ -18,10 +18,10 @@ ;; ============================================================================= ;; Used by keep-number-reasonable as the maximum magnitude of any integer/float -(def max-number-magnitude 1.0E12) +(def max-number-magnitude 1.0E6) ;; Used by keep-number-reasonable as the minimum magnitude of any float -(def min-number-magnitude 1.0E-10) +(def min-number-magnitude 1.0E-6) ;; Used by reasonable-string-length? to ensure that strings don't get too large (def max-string-length 1000)