Merge branch 'master' into track-selection-counts

lspector · Jul 1, 2015 · f3dfe12 · f3dfe12
2 parents 4fa2431 + 20501c6
commit f3dfe12
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 321 deletions.
diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojush "2.0.28"
+(defproject clojush "2.0.32"
   :description "The Push programming language and the PushGP genetic programming
                 system implemented in Clojure.
                 See http://hampshire.edu/lspector/push.html"
@@ -12,16 +12,9 @@
                  [local-file "0.1.0"]
                  [clojure-csv "2.0.0-alpha2"]
                  [org.clojure/data.json "0.1.3"]
-                 [clj-random "0.1.7"]
-                 ;[incanter/incanter-core "1.5.2"]
-                 ]
+                 [clj-random "0.1.7"]]
   :dev-dependencies [[lein-ccw "1.2.0"]]
-  ;; the following, or a variant, may be helpful on big machines
-  ;:jvm-opts ["-Xmx58g" "-Xms58g" "-XX:+UseParallelGC"]
-  ;:jvm-opts ["-Xmx12g" "-Xms12g" "-XX:+UseParallelGC"]
-  ;:jvm-opts ["-Xmx58g" "-Xms58g" "-XX:+UseParallelGC" "-Djava.awt.headless=true"]
-  ;; the following should automatically take 80% of the machine's RAM and also 
-  ;; turn on some other jvm settings for high performance
+  ;;;;;;;;;; jvm settings for high performance, using most of the machine's RAM
 ;  :jvm-opts ~(let [mem-to-use
 ;                   (long (* (.getTotalPhysicalMemorySize
 ;                              (java.lang.management.ManagementFactory/getOperatingSystemMXBean))
@@ -30,6 +23,10 @@
 ;                          (str "-Xms" mem-to-use)
 ;                          "-server"
 ;                          "-XX:-TieredCompilation"
-;                          "-XX:+AggressiveOpts"])
+;                          "-XX:+AggressiveOpts"
+;                          "-Djava.awt.headless=true"])
+  ;;;;;;;;;; misc other jvm-opts
+  ;:jvm-opts ["-Djava.awt.headless=true"]
   ;;"-XX:+UseG1GC"
+  ;:jvm-opts ["-Xmx12g" "-Xms12g" "-XX:+UseParallelGC"]
   :main clojush.core)
diff --git a/src/clojush/instructions/genome.clj b/src/clojush/instructions/genome.clj
@@ -242,3 +242,9 @@
   (fn [state]
     (push-item (:parent2-genome state) :genome state)))
 
+(define-registered
+  autoconstructive_integer_rand 
+  ;; pushes a constant integer, but is replaced with integer_rand during 
+  ;; nondetermistic autoconstruction
+  ^{:stack-types [:genome]} (fn [state] (push-item 23 :integer state)))
+
diff --git a/src/clojush/problems/demos/autoconstructive_digital_multiplier.clj b/src/clojush/problems/demos/autoconstructive_digital_multiplier.clj
diff --git a/src/clojush/problems/regression/pagie_hogeweg.clj b/src/clojush/problems/regression/pagie_hogeweg.clj
@@ -1,14 +1,14 @@
-; pagie_hogeweg_no_erc.clj
+; pagie_hogeweg.clj
 ;
 ; The Pagie-Hogeweg problem without a float ERC; instead, just
 ; uses the constant 1.0 as an atom generator.
 
 (ns clojush.problems.regression.pagie-hogeweg
   (:use clojush.pushgp.pushgp)
-  (:require clojush.examples.pagie-hogeweg))
+  (:require clojush.problems.regression.pagie-hogeweg-with-erc))
 
 (def argmap
-  (merge clojush.examples.pagie-hogeweg/argmap
+  (merge clojush.problems.regression.pagie-hogeweg-with-erc/argmap
          {:atom-generators (list 1.0
                                  'x
                                  'y