   :error-function e
   :use-single-thread false
   :population-size 1000
-  :trivial-geography-radius 500
+  :trivial-geography-radius 10
   :error-threshold 0.01
   :max-generations 1001
-  :max-points 150
-  :evalpush-limit 300
+  :max-points 250
+  :evalpush-limit 500
   :evalpush-time-limit 0
   :tournament-size 7
   :reuse-errors true

  (:use [clojush]))

;;;;;;;;;;;;
;; Multiple geometric formulae. An integer indicates the desired formula and
;; inputs are provided on the float stack.

;; Using just circle-related ones for now:

                 1000000))))))
     
;; a solution, for testing purposes
(reduce + (e '(circle-circumference? 
                exec_if 
                (r 3.141592 float_mult 2.0 float_mult)
                (circle-area? 
                  exec_if 
                  (r r float_mult 3.141592 float_mult)
                  (cylinder-volume? 
                    exec_if 
                    (r r float_mult h float_mult 3.141592 float_mult)
                    (cone-volume? 
                      exec_if 
                      (r r float_mult h float_mult 3.141592 float_mult 3.0 float_div)
                      (r r float_mult r float_mult 3.141592 float_mult 4.0 float_mult 3.0 float_div)))))))

(pushgp 
  :atom-generators (concat (list (fn [] (lrand-int 5))
                                 (fn [] (float (lrand-int 5)))
                                 (fn [] Math/PI)
                                 'r
                                 'h
                                 (tag-instruction-erc [:exec :integer :float :boolean] 1000)
                                 (tagged-instruction-erc 1000)
                                 )
                           (take 30 (cycle [(tag-instruction-erc [:exec :integer :float :boolean] 1000)
                                            (tagged-instruction-erc 1000)
                                            'exec_if]))
                           mode-test-instructions
                           '(integer_add
                              integer_eq
                              integer_swap
