Merge pull request #4 from skwak22/master

Converted to cljc (without xml files)

src/propeller/core.cljc

@@ -1,8 +1,9 @@
 (ns propeller.core
-  (:gen-class)
+  #?(:clj (:gen-class))
   (:require [propeller.gp :as gp]
             [propeller.problems.simple-regression :as regression]
-            [propeller.problems.string-classification :as string-classif]))
+            [propeller.problems.string-classification :as string-classif]
+            #?(:cljs [cljs.reader :refer [read-string]])))
 
 (defn -main
   "Runs propel-gp, giving it a map of arguments."

src/propeller/gp.cljc

@@ -2,8 +2,8 @@
   (:require [propeller.genome :as genome]
             [propeller.variation :as variation]
             [propeller.push.core :as push]
-            [propeller.push.instructions.boolean]
+            [propeller.push.instructions.bool]
-            [propeller.push.instructions.char]
+            [propeller.push.instructions.chara]
             [propeller.push.instructions.code]
             [propeller.push.instructions.input-output]
             [propeller.push.instructions.numeric]

src/propeller/push/instructions/bool.cljc

@@ -1,7 +1,8 @@
-(ns propeller.push.instructions.boolean
+(ns propeller.push.instructions.bool
-  (:require [propeller.push.utils :refer [def-instruction
+  #?(:cljs (:require-macros [propeller.push.utils :refer [def-instruction
                                                           make-instruction]]))
-
+  (:require #?(:clj [propeller.push.utils :refer [def-instruction
+                                                  make-instruction]])))
 ;; =============================================================================
 ;; BOOLEAN Instructions
 ;; =============================================================================

src/propeller/push/instructions/chara.cljc

@@ -1,8 +1,10 @@
-(ns propeller.push.instructions.char
+(ns propeller.push.instructions.chara
+  #?(:cljs (:require-macros [propeller.push.utils :refer [def-instruction
+                                                          make-instruction]]))
   (:require [propeller.push.state :as state]
-            [propeller.push.utils :refer [def-instruction
+            [propeller.tools.character :as char]
-                                          make-instruction]]
+            #?(:clj [propeller.push.utils :refer [def-instruction
-            [propeller.tools.character :as char]))
+                                                  make-instruction]])))
 
 ;; =============================================================================
 ;; CHAR Instructions

src/propeller/push/instructions/code.cljc

@@ -1,9 +1,12 @@
 (ns propeller.push.instructions.code
-  (:require [propeller.utils :as utils]
+  #?(:cljs (:require-macros [propeller.push.utils :refer [def-instruction
-            [propeller.push.state :as state]
-            [propeller.push.utils :refer [def-instruction
                                                           generate-instructions
                                                           make-instruction]]))
+  (:require [propeller.utils :as utils]
+            [propeller.push.state :as state]
+            #?(:clj [propeller.push.utils :refer [def-instruction
+                                                  generate-instructions
+                                                  make-instruction]])))
 
 ;; =============================================================================
 ;; Polymorphic Instructions

src/propeller/push/instructions/input_output.cljc

@@ -1,7 +1,9 @@
 (ns propeller.push.instructions.input-output
+  #?(:cljs (:require-macros [propeller.push.utils :refer
+                             [def-instruction generate-instructions]]))
   (:require [propeller.push.state :as state]
-            [propeller.push.utils :refer [def-instruction
+            #?(:clj [propeller.push.utils :refer [def-instruction
-                                          generate-instructions]]))
+                                                  generate-instructions]])))
 
 ;; =============================================================================
 ;; INPUT Instructions

src/propeller/push/instructions/numeric.cljc

@@ -1,8 +1,11 @@
 (ns propeller.push.instructions.numeric
-  (:require [propeller.push.utils :refer [def-instruction
+  #?(:cljs (:require-macros [propeller.push.utils :refer [def-instruction
                                                           generate-instructions
-                                          make-instruction]]
+                                                          make-instruction]]))
-            [propeller.tools.math :as math]))
+  (:require [propeller.tools.math :as math]
+            #?(:clj [propeller.push.utils :refer [def-instruction
+                                                  generate-instructions
+                                                  make-instruction]])))
 
 ;; =============================================================================
 ;; FLOAT and INTEGER Instructions (polymorphic)

src/propeller/push/instructions/polymorphic.cljc

@@ -1,8 +1,10 @@
 (ns propeller.push.instructions.polymorphic
+  #?(:cljs (:require-macros [propeller.push.utils :refer [generate-instructions
+                                                          make-instruction]]))
   (:require [propeller.utils :as utils]
             [propeller.push.state :as state]
-            [propeller.push.utils :refer [generate-instructions
+            #?(:clj [propeller.push.utils :refer [generate-instructions
-                                          make-instruction]]))
+                                                  make-instruction]])))
 
 ;; =============================================================================
 ;; Polymorphic Instructions

src/propeller/push/instructions/random.clj

@@ -1,4 +0,0 @@
-(ns propeller.push.instructions.random
-  (:require [propeller.push.utils :refer [def-instruction]]))
-
-

src/propeller/push/instructions/random.cljc

@@ -0,0 +1,5 @@
+(ns propeller.push.instructions.random
+  #?(:cljs (:require-macros [propeller.push.utils :refer [def-instruction]]))
+  #?(:clj (:require [propeller.push.utils :refer [def-instruction]])))
+
+

src/propeller/push/instructions/string.cljc

@@ -1,7 +1,10 @@
 (ns propeller.push.instructions.string
-  (:require [propeller.push.utils :refer [def-instruction
+  #?(:cljs (:require-macros [propeller.push.utils :refer [def-instruction
                                                           make-instruction]]))
 
+  (:require #?(:clj [propeller.push.utils :refer [def-instruction
+                                                  make-instruction]])))
+
 ;; =============================================================================
 ;; STRING Instructions
 ;; =============================================================================

src/propeller/push/instructions/vector.cljc

@@ -1,10 +1,13 @@
 (ns propeller.push.instructions.vector
+  #?(:cljs (:require-macros [propeller.push.utils :refer [def-instruction
+                                                          generate-instructions
+                                                          make-instruction]]))
   (:require [clojure.string]
             [propeller.utils :as utils]
             [propeller.push.state :as state]
-            [propeller.push.utils :refer [def-instruction
+            #?(:clj [propeller.push.utils :refer [def-instruction
                                                   generate-instructions
-                                          make-instruction]]))
+                                                  make-instruction]])))
 
 ;; =============================================================================
 ;; VECTOR Instructions