Added random-push-code function

lspector · Jul 4, 2014 · cdc482f · cdc482f
1 parent be6d914
commit cdc482f
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -165,14 165,13 @@ the resulting interpreter state:
 
 ```clojure
 (let [s (make-push-state)
- c (random-code 
  c (random-push-code 
  100 ;; size limit of 100 points
  (concat @registered-instructions ;; all registered instrs 
  (list (fn [] (rand-int 100)) ;; random integers from 0-99
  (fn [] (rand)))))] ;; random floats from 0.0-1.0
  (printf "\n\nCode: %s\n\n" (apply list c))
- (run-push (translate-plush-genome-to-push-program {:genome c})
- s))
  (run-push c s))
 ```
 
 If you look at the resulting interpreter state you will see an "auxiliary" 

diff --git a/src/clojush/instructions/random_instructions.clj b/src/clojush/instructions/random_instructions.clj
@@ -34,11 34,10 @@
  (binding [*out* *err*]
  (println "code_rand: global-atom-generators is empty.")
  state)
- (push-item (translate-plush-genome-to-push-program
- {:genome (random-plush-genome (max 1
- (math/abs (mod (stack-ref :integer 0 state)
- max-points-in-random-expressions)))
- @global-atom-generators)})
  (push-item (random-push-code (max 1
  (math/abs (mod (stack-ref :integer 0 state)
  max-points-in-random-expressions)))
  @global-atom-generators)
  :code
  (pop-item :integer state)))
  state)))

diff --git a/src/clojush/problems/boolean/valiant.clj b/src/clojush/problems/boolean/valiant.clj
@@ -1,3 1,8 @@
 
 ;============== NOTE NOTE NOTE =================
 ; This file has note been updated for Clojush 2.0, and will likely not work
 ;============== NOTE NOTE NOTE =================
 
 (ns clojush.problems.boolean.valiant
  (:use [clojush.pushgp.pushgp]
  [clojush.pushstate]

diff --git a/src/clojush/problems/software/calc.clj b/src/clojush/problems/software/calc.clj
@@ -1,3 1,9 @@
 
 ;============== NOTE NOTE NOTE =================
 ; This file has note been updated for Clojush 2.0, and will not work
 ; for example, genetic operators haven't been updated
 ;============== NOTE NOTE NOTE =================
 
 (ns clojush.problems.software.calc
  (:use [clojush.pushgp.pushgp]
  [clojush.pushstate]

diff --git a/src/clojush/random.clj b/src/clojush/random.clj
@@ -1,6 1,6 @@
 (ns clojush.random
- (:require [clj-random.core :as random])
- (:use [clojush.globals]))
  (:use [clojush globals translate])
  (:require [clj-random.core :as random]))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; random functions
@@ -16,7 16,7 @@
 (def lshuffle random/lshuffle)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; random code generator
 ;; random plush genome generator
 
 (defn random-closes
  "Returns a random number of closes based on close-parens-probabilities, which
@@ -68,18 68,29 @@
  markers)))))
 
 (defn random-plush-genome-with-size
- "Returns a random Plush expression containing the given number of points."
  "Returns a random Plush genome containing the given number of points."
  [points atom-generators argmap]
  (repeatedly points
  (partial random-plush-instruction-map
  atom-generators
  argmap)))
 
 (defn random-plush-genome
- "Returns a random expression with size limited by max-points."
  "Returns a random Plush genome with size limited by max-points."
  ([max-points atom-generators]
  (random-plush-genome max-points atom-generators {}))
  ([max-points atom-generators argmap]
  (random-plush-genome-with-size (inc (lrand-int max-points))
  atom-generators
  argmap)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; random Push code generator
 
 (defn random-push-code
  "Returns a random Push expression with size limited by max-points."
  ([max-points atom-generators]
  (random-push-code max-points atom-generators {}))
  ([max-points atom-generators argmap]
  (translate-plush-genome-to-push-program
  {:genome (random-plush-genome max-points atom-generators argmap)})))
diff --git a/src/clojush/util.clj b/src/clojush/util.clj
@@ -1,10 1,9 @@
 (ns clojush.util
  (:use clojush.globals)
  (:require [clojure.math.numeric-tower :as math]
  [clojure.zip :as zip]
  [clojure.walk :as walk]
- [clojure.string :as string])
- (:use [clojush.globals]
- [clojush.random]))
  [clojure.string :as string]))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; utilities