more namespace compatibility changes

src/propeller/core.clj

@@ -2,8 +2,8 @@
   (:gen-class)
   (:require [propeller.gp :as gp]
             [propeller.push.core :as push]
-            (propeller.problems [simple-regression :as regression]
+            [propeller.problems.simple-regression :as regression]
-                                [string-classification :as string-classif])))
+            [propeller.problems.string-classification :as string-classif]))
 
 (defn -main
   "Runs propel-gp, giving it a map of arguments."

src/propeller/gp.clj

@@ -1,6 +1,6 @@
 (ns propeller.gp
-  (:require (propeller [genome :as genome]
+  (:require [propeller.genome :as genome]
-                       [variation :as variation])
+            [propeller.variation :as variation]
             [propeller.push.core :as push]))
 
 (defn report

src/propeller/problems/simple_regression.clj

@@ -1,7 +1,7 @@
 (ns propeller.problems.simple-regression
   (:require [propeller.genome :as genome]
-            (propeller.push [interpreter :as interpreter]
+            [propeller.push.interpreter :as interpreter]
-                            [state :as state])
+            [propeller.push.state :as state]
             [propeller.tools.math :as math]))
 
 ;; =============================================================================

src/propeller/problems/string_classification.clj

@@ -1,7 +1,7 @@
 (ns propeller.problems.string-classification
   (:require [propeller.genome :as genome]
-            (propeller.push [interpreter :as interpreter]
+            [propeller.push.interpreter :as interpreter]
-                            [state :as state])))
+            [propeller.push.state :as state]))
 
 ;; =============================================================================
 ;; String classification

src/propeller/push/instructions/code.clj

@@ -1,7 +1,7 @@
 (ns propeller.push.instructions.code
-  (:require (propeller.push [state :as state]
+  (:require [propeller.push.state :as state]
-                            [utils :refer [def-instruction
+            [propeller.push.utils :refer [def-instruction
-                                           make-instruction]])))
+                                           make-instruction]]))
 
 ;; =============================================================================
 ;; CODE and EXEC Instructions

src/propeller/push/instructions/input_output.clj

@@ -1,6 +1,6 @@
 (ns propeller.push.instructions.input-output
-  (:require (propeller.push [state :as state]
+  (:require [propeller.push.state :as state]
-                            [utils :refer [def-instruction]])))
+            [propeller.push.utils :refer [def-instruction]]))
 
 ;; =============================================================================
 ;; INPUT and OUTPUT Instructions

src/propeller/push/instructions/polymorphic.clj

@@ -1,8 +1,8 @@
 (ns propeller.push.instructions.polymorphic
-  (:require (propeller.push [state :as state]
+  (:require  [propeller.push.state :as state]
-                            [utils :refer [def-instruction
+             [propeller.push.utils :refer [def-instruction
                                            generate-functions
-                                           make-instruction]])))
+                                           make-instruction]]))
 
 ;; =============================================================================
 ;; Polymorphic Instructions

src/propeller/push/interpreter.clj

@@ -1,6 +1,6 @@
 (ns propeller.push.interpreter
-  (:require (propeller.push [core :as push]
+  (:require [propeller.push.core :as push]
-                            [state :as state])))
+            [propeller.push.state :as state]))
 
 (defn interpret-one-step
   "Takes a Push state and executes the next instruction on the exec stack."

src/propeller/push/utils.clj

@@ -1,6 +1,6 @@
 (ns propeller.push.utils
-  (:require (propeller.push [core :as push]
+  (:require [propeller.push.core :as push]
-                            [state :as state])))
+            [propeller.push.state :as state]))
 
 (defmacro def-instruction
   [instruction definition]

src/propeller/session.clj

@@ -1,13 +1,13 @@
 (ns propeller.session
-  (:require (propeller [genome :as genome]
+  (:require [propeller.genome :as genome]
-                       [gp :as gp]
+            [propeller.gp :as gp]
-                       [selection :as selection]
+            [propeller.selection :as selection]
-                       [variation :as variation])
+            [propeller.variation :as variation]
-            (propeller.push [core :as push]
+            [propeller.push.core :as push]
-                            [interpreter :as interpreter]
+            [propeller.interpreter :as interpreter]
-                            [state :as state])
+            [propeller.state :as state]
-            (propeller.problems [simple-regression :as regression]
+            [propeller.problems.simple-regression :as regression]
-                                [string-classification :as string-classif])))
+            [propeller.problems.string-classification :as string-classif]))
 
 #_(interpreter/interpret-program
     '(1 2 integer_add) state/empty-state 1000)

src/propeller/tools/distributions.cljc

@@ -1,6 +1,6 @@
 (ns propeller.tools.distributions
-  (:require (propeller.tools [calculus :as calculus]
+  (:require [propeller.tools.calculus :as calculus]
-                             [math :as math])))
+            [propeller.tools.math :as math]))
 
 ;; =============================================================================
 ;; NORMAL