Merge branch 'lspector:master' into master

src/propeller/problems/PSB2/basement.cljc

@@ -6,7 +6,8 @@
             [propeller.push.utils.helpers :refer [get-stack-instructions]]
             [propeller.push.state :as state]
             [propeller.tools.math :as math]
-            [propeller.gp :as gp]))
+            [propeller.gp :as gp]
+            #?(:cljs [cljs.reader :refer [read-string]])))
 
 ; ===========  PROBLEM DESCRIPTION  ============================
 ; BASEMENT from PSB2

src/propeller/problems/PSB2/bouncing_balls.cljc

@@ -7,7 +7,8 @@
             [propeller.push.state :as state]
             [clojure.pprint :as pprint]
             [propeller.tools.math :as math]
-            [propeller.gp :as gp]))
+            [propeller.gp :as gp]
+            #?(:cljs [cljs.reader :refer [read-string]])))
 
 ; ===========  PROBLEM DESCRIPTION  ===============================
 ; BOUNCING BALLS from PSB2

src/propeller/problems/PSB2/bowling.cljc

@@ -6,7 +6,8 @@
             [propeller.push.utils.helpers :refer [get-stack-instructions]]
             [propeller.push.state :as state]
             [propeller.tools.math :as math]
-            [propeller.gp :as gp]))
+            [propeller.gp :as gp]
+            #?(:cljs [cljs.reader :refer [read-string]])))
 
 ; ===========  PROBLEM DESCRIPTION  ======================
 ; BOWLING from PSB2

src/propeller/problems/PSB2/camel_case.cljc

@@ -6,7 +6,8 @@
             [propeller.push.utils.helpers :refer [get-stack-instructions]]
             [propeller.push.state :as state]
             [propeller.tools.metrics :as metrics]
-            [propeller.gp :as gp]))
+            [propeller.gp :as gp]
+            #?(:cljs [cljs.reader :refer [read-string]])))
 
 ; ===========  PROBLEM DESCRIPTION  =====================================
 ; CAMEL CASE from PSB2

src/propeller/problems/PSB2/dice_game.cljc

@@ -6,7 +6,8 @@
             [propeller.push.utils.helpers :refer [get-stack-instructions]]
             [propeller.push.state :as state]
             [propeller.tools.math :as math]
-            [propeller.gp :as gp]))
+            [propeller.gp :as gp]
+            #?(:cljs [cljs.reader :refer [read-string]])))
 
 ; ===========  PROBLEM DESCRIPTION  ===============================
 ; DICE GAME from PSB2

src/propeller/problems/PSB2/fizz_buzz.cljc

@@ -6,7 +6,8 @@
             [propeller.push.utils.helpers :refer [get-stack-instructions]]
             [propeller.push.state :as state]
             [propeller.tools.metrics :as metrics]
-            [propeller.gp :as gp]))
+            [propeller.gp :as gp]
+            #?(:cljs [cljs.reader :refer [read-string]])))
 
 ; ===========  PROBLEM DESCRIPTION  =========================
 ; FIZZ BUZZ from PSB2

src/propeller/problems/PSB2/fuel_cost.cljc

@@ -6,7 +6,8 @@
             [propeller.push.utils.helpers :refer [get-stack-instructions]]
             [propeller.push.state :as state]
             [propeller.tools.math :as math]
-            [propeller.gp :as gp]))
+            [propeller.gp :as gp]
+            #?(:cljs [cljs.reader :refer [read-string]])))
 
 ; ===========  PROBLEM DESCRIPTION  =========================
 ; FUEL COST from PSB2

src/propeller/problems/PSB2/gcd.cljc

@@ -6,7 +6,8 @@
             [propeller.push.utils.helpers :refer [get-stack-instructions]]
             [propeller.push.state :as state]
             [propeller.tools.math :as math]
-            [propeller.gp :as gp]))
+            [propeller.gp :as gp]
+            #?(:cljs [cljs.reader :refer [read-string]])))
 
 ; ===========  PROBLEM DESCRIPTION  ===============================
 ; GCD [GREATEST COMMON DIVISOR] from PSB2

src/propeller/problems/PSB2/luhn.cljc

@@ -6,7 +6,8 @@
             [propeller.push.utils.helpers :refer [get-stack-instructions]]
             [propeller.push.state :as state]
             [propeller.tools.math :as math]
-            [propeller.gp :as gp]))
+            [propeller.gp :as gp]
+            #?(:cljs [cljs.reader :refer [read-string]])))
 
 ; ===========  PROBLEM DESCRIPTION  ============================
 ; LUHN from PSB2

src/propeller/problems/PSB2/middle_character.cljc

@@ -6,7 +6,8 @@
             [propeller.push.utils.helpers :refer [get-stack-instructions]]
             [propeller.push.state :as state]
             [propeller.tools.metrics :as metrics]
-            [propeller.gp :as gp]))
+            [propeller.gp :as gp]
+            #?(:cljs [cljs.reader :refer [read-string]])))
 
 ; ===========  PROBLEM DESCRIPTION  =============================
 ; MIDDLE CHARACTER from PSB2

src/propeller/problems/PSB2/paired_digits.cljc

@@ -6,7 +6,8 @@
             [propeller.push.utils.helpers :refer [get-stack-instructions]]
             [propeller.push.state :as state]
             [propeller.tools.math :as math]
-            [propeller.gp :as gp]))
+            [propeller.gp :as gp]
+            #?(:cljs [cljs.reader :refer [read-string]])))
 
 ; ===========  PROBLEM DESCRIPTION  =============================
 ; PAIRED DIGITS from PSB2

src/propeller/problems/PSB2/shopping_list.cljc

@@ -6,7 +6,8 @@
             [propeller.push.utils.helpers :refer [get-stack-instructions]]
             [propeller.push.state :as state]
             [propeller.tools.math :as math]
-            [propeller.gp :as gp]))
+            [propeller.gp :as gp]
+            #?(:cljs [cljs.reader :refer [read-string]])))
 
 ; ===========  PROBLEM DESCRIPTION  ===============================
 ; DICE GAME from PSB2

src/propeller/problems/PSB2/snow_day.cljc

@@ -6,7 +6,8 @@
             [propeller.push.utils.helpers :refer [get-stack-instructions]]
             [propeller.push.state :as state]
             [propeller.tools.math :as math]
-            [propeller.gp :as gp]))
+            [propeller.gp :as gp]
+            #?(:cljs [cljs.reader :refer [read-string]])))
 
 ; ===========  PROBLEM DESCRIPTION  ===============================
 ; SNOW DAY from PSB2

src/propeller/problems/PSB2/solve_boolean.cljc

@@ -5,7 +5,8 @@
             [propeller.utils :as utils]
             [propeller.push.utils.helpers :refer [get-stack-instructions]]
             [propeller.push.state :as state]
-            [propeller.gp :as gp]))
+            [propeller.gp :as gp]
+            #?(:cljs [cljs.reader :refer [read-string]])))
 
 ; ===========  PROBLEM DESCRIPTION  ================================
 ; SOLVE BOOLEAN from PSB2

src/propeller/problems/PSB2/spin_words.cljc

@@ -6,7 +6,8 @@
             [propeller.push.utils.helpers :refer [get-stack-instructions]]
             [propeller.push.state :as state]
             [propeller.tools.metrics :as metrics]
-            [propeller.gp :as gp]))
+            [propeller.gp :as gp]
+            #?(:cljs [cljs.reader :refer [read-string]])))
 
 ; ===========  PROBLEM DESCRIPTION  ==============================
 ; SPIN WORDS from PSB2

src/propeller/problems/PSB2/square_digits.cljc

@@ -6,7 +6,8 @@
             [propeller.push.utils.helpers :refer [get-stack-instructions]]
             [propeller.push.state :as state]
             [propeller.tools.metrics :as metrics]
-            [propeller.gp :as gp]))
+            [propeller.gp :as gp]
+            #?(:cljs [cljs.reader :refer [read-string]])))
 
 ; ===========  PROBLEM DESCRIPTION  =========================
 ; SQUARE DIGITS from PSB2

src/propeller/problems/PSB2/substitution_cipher.cljc

@@ -7,7 +7,8 @@
             [propeller.push.state :as state]
             [propeller.tools.math :as math]
             [propeller.tools.metrics :as metrics]
-            [propeller.gp :as gp]))
+            [propeller.gp :as gp]
+            #?(:cljs [cljs.reader :refer [read-string]])))
 
 ; ===========  PROBLEM DESCRIPTION  =========================
 ; SUBSTITUTION CIPHER from PSB2

src/propeller/problems/PSB2/twitter.cljc

@@ -7,7 +7,8 @@
             [propeller.push.state :as state]
             [propeller.tools.math :as math]
             [propeller.tools.metrics :as metrics]
-            [propeller.gp :as gp]))
+            [propeller.gp :as gp]
+            #?(:cljs [cljs.reader :refer [read-string]])))
 
 ; ===========  PROBLEM DESCRIPTION  =============================
 ; TWITTER from PSB2

src/propeller/problems/simple_regression.cljc

@@ -3,7 +3,8 @@
             [propeller.push.interpreter :as interpreter]
             [propeller.push.state :as state]
             [propeller.tools.math :as math]
-            [propeller.gp :as gp]))
+            [propeller.gp :as gp]
+            #?(:cljs [cljs.reader :refer [read-string]])))
 
 (defn- target-function
   "Target function: f(x) = x^3 + x + 3"

src/propeller/problems/string_classification.cljc

@@ -2,7 +2,8 @@
   (:require [propeller.genome :as genome]
             [propeller.push.interpreter :as interpreter]
             [propeller.push.state :as state]
-            [propeller.gp :as gp]))
+            [propeller.gp :as gp]
+            #?(:cljs [cljs.reader :refer [read-string]])))
 
 ;; =============================================================================
 ;; String classification

src/propeller/problems/valiant.cljc

@@ -2,7 +2,8 @@
   (:require [propeller.genome :as genome]
             [propeller.push.interpreter :as interpreter]
             [propeller.push.state :as state]
-            [propeller.gp :as gp]))
+            [propeller.gp :as gp]
+            #?(:cljs [cljs.reader :refer [read-string]])))
 
 (def num-vars 100)                                          ;10) ;100)                                          ;1000)
 (def num-inputs 50)                                         ;5) ; 50)                                         ;500)

src/propeller/push/utils/helpers.cljc

@@ -113,21 +113,21 @@
 ;; :integer. Otherwise, return nil"
 (defn get-literal-type
   [data]
-  (let [literals {:boolean        (fn [thing] (or (true? thing) (false? thing)))
+  (let [literals [[:boolean        (fn [thing] (or (true? thing) (false? thing)))]
-                  :char           char?
+                  [:integer        integer?]
-                  :float          float?
+                  [:float          float?]
-                  :integer        integer?
+                  [:string         string?]
-                  :string         string?
+                  [:char           char?]
-                  :vector_boolean (fn [thing] (and (vector? thing)
+                  [:vector_boolean (fn [thing] (and (vector? thing)
                                                    (or (true? (first thing))
-                                                       (false? (first thing)))))
+                                                       (false? (first thing)))))]
-                  :vector_float   (fn [thing] (and (vector? thing)
+                  [:vector_float   (fn [thing] (and (vector? thing)
-                                                   (float? (first thing))))
+                                                   (float? (first thing))))]
-                  :vector_integer (fn [thing] (and (vector? thing)
+                  [:vector_integer (fn [thing] (and (vector? thing)
-                                                   (integer? (first thing))))
+                                                   (integer? (first thing))))]
-                  :vector_string  (fn [thing] (and (vector? thing)
+                  [:vector_string  (fn [thing] (and (vector? thing)
-                                                   (string? (first thing))))
+                                                   (string? (first thing))))]
-                  :generic-vector (fn [thing] (= [] thing))}]
+                  [:generic-vector (fn [thing] (= [] thing))]]]
     (first (for [[stack function] literals
                  :when (function data)]
              stack))))