Merge pull request #2 from skwak22/master
More namespace compatibility changes
This commit is contained in:
commit
07956a0eca
@ -2,8 +2,8 @@
|
||||
(:gen-class)
|
||||
(:require [propeller.gp :as gp]
|
||||
[propeller.push.core :as push]
|
||||
(propeller.problems [simple-regression :as regression]
|
||||
[string-classification :as string-classif])))
|
||||
[propeller.problems.simple-regression :as regression]
|
||||
[propeller.problems.string-classification :as string-classif]))
|
||||
|
||||
(defn -main
|
||||
"Runs propel-gp, giving it a map of arguments."
|
||||
|
@ -1,6 +1,6 @@
|
||||
(ns propeller.gp
|
||||
(:require (propeller [genome :as genome]
|
||||
[variation :as variation])
|
||||
(:require [propeller.genome :as genome]
|
||||
[propeller.variation :as variation]
|
||||
[propeller.push.core :as push]))
|
||||
|
||||
(defn report
|
||||
|
@ -1,7 +1,7 @@
|
||||
(ns propeller.problems.simple-regression
|
||||
(:require [propeller.genome :as genome]
|
||||
(propeller.push [interpreter :as interpreter]
|
||||
[state :as state])
|
||||
[propeller.push.interpreter :as interpreter]
|
||||
[propeller.push.state :as state]
|
||||
[propeller.tools.math :as math]))
|
||||
|
||||
;; =============================================================================
|
||||
|
@ -1,7 +1,7 @@
|
||||
(ns propeller.problems.string-classification
|
||||
(:require [propeller.genome :as genome]
|
||||
(propeller.push [interpreter :as interpreter]
|
||||
[state :as state])))
|
||||
[propeller.push.interpreter :as interpreter]
|
||||
[propeller.push.state :as state]))
|
||||
|
||||
;; =============================================================================
|
||||
;; String classification
|
||||
|
@ -1,7 +1,7 @@
|
||||
(ns propeller.push.instructions.code
|
||||
(:require (propeller.push [state :as state]
|
||||
[utils :refer [def-instruction
|
||||
make-instruction]])))
|
||||
(:require [propeller.push.state :as state]
|
||||
[propeller.push.utils :refer [def-instruction
|
||||
make-instruction]]))
|
||||
|
||||
;; =============================================================================
|
||||
;; CODE and EXEC Instructions
|
||||
|
@ -1,6 +1,6 @@
|
||||
(ns propeller.push.instructions.input-output
|
||||
(:require (propeller.push [state :as state]
|
||||
[utils :refer [def-instruction]])))
|
||||
(:require [propeller.push.state :as state]
|
||||
[propeller.push.utils :refer [def-instruction]]))
|
||||
|
||||
;; =============================================================================
|
||||
;; INPUT and OUTPUT Instructions
|
||||
|
@ -1,8 +1,8 @@
|
||||
(ns propeller.push.instructions.polymorphic
|
||||
(:require (propeller.push [state :as state]
|
||||
[utils :refer [def-instruction
|
||||
(:require [propeller.push.state :as state]
|
||||
[propeller.push.utils :refer [def-instruction
|
||||
generate-functions
|
||||
make-instruction]])))
|
||||
make-instruction]]))
|
||||
|
||||
;; =============================================================================
|
||||
;; Polymorphic Instructions
|
||||
|
@ -1,6 +1,6 @@
|
||||
(ns propeller.push.interpreter
|
||||
(:require (propeller.push [core :as push]
|
||||
[state :as state])))
|
||||
(:require [propeller.push.core :as push]
|
||||
[propeller.push.state :as state]))
|
||||
|
||||
(defn interpret-one-step
|
||||
"Takes a Push state and executes the next instruction on the exec stack."
|
||||
|
@ -1,6 +1,6 @@
|
||||
(ns propeller.push.utils
|
||||
(:require (propeller.push [core :as push]
|
||||
[state :as state])))
|
||||
(:require [propeller.push.core :as push]
|
||||
[propeller.push.state :as state]))
|
||||
|
||||
(defmacro def-instruction
|
||||
[instruction definition]
|
||||
|
@ -1,13 +1,13 @@
|
||||
(ns propeller.session
|
||||
(:require (propeller [genome :as genome]
|
||||
[gp :as gp]
|
||||
[selection :as selection]
|
||||
[variation :as variation])
|
||||
(propeller.push [core :as push]
|
||||
[interpreter :as interpreter]
|
||||
[state :as state])
|
||||
(propeller.problems [simple-regression :as regression]
|
||||
[string-classification :as string-classif])))
|
||||
(:require [propeller.genome :as genome]
|
||||
[propeller.gp :as gp]
|
||||
[propeller.selection :as selection]
|
||||
[propeller.variation :as variation]
|
||||
[propeller.push.core :as push]
|
||||
[propeller.interpreter :as interpreter]
|
||||
[propeller.state :as state]
|
||||
[propeller.problems.simple-regression :as regression]
|
||||
[propeller.problems.string-classification :as string-classif]))
|
||||
|
||||
#_(interpreter/interpret-program
|
||||
'(1 2 integer_add) state/empty-state 1000)
|
||||
|
@ -1,6 +1,6 @@
|
||||
(ns propeller.tools.distributions
|
||||
(:require (propeller.tools [calculus :as calculus]
|
||||
[math :as math])))
|
||||
(:require [propeller.tools.calculus :as calculus]
|
||||
[propeller.tools.math :as math]))
|
||||
|
||||
;; =============================================================================
|
||||
;; NORMAL
|
||||
|
Loading…
x
Reference in New Issue
Block a user