From b417e4c2aae3271ad743475de8f277cb3013a963 Mon Sep 17 00:00:00 2001 From: skwak22 Date: Fri, 26 Jun 2020 02:09:28 +0900 Subject: [PATCH] more namespace compatibility changes --- src/propeller/core.clj | 4 ++-- src/propeller/gp.clj | 4 ++-- src/propeller/problems/simple_regression.clj | 4 ++-- .../problems/string_classification.clj | 4 ++-- src/propeller/push/instructions/code.clj | 6 +++--- .../push/instructions/input_output.clj | 4 ++-- .../push/instructions/polymorphic.clj | 6 +++--- src/propeller/push/interpreter.clj | 4 ++-- src/propeller/push/utils.clj | 4 ++-- src/propeller/session.clj | 18 +++++++++--------- src/propeller/tools/distributions.cljc | 4 ++-- 11 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/propeller/core.clj b/src/propeller/core.clj index 82cce94..5923f16 100644 --- a/src/propeller/core.clj +++ b/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] - [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." diff --git a/src/propeller/gp.clj b/src/propeller/gp.clj index eee2ecc..1028c1e 100644 --- a/src/propeller/gp.clj +++ b/src/propeller/gp.clj @@ -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 diff --git a/src/propeller/problems/simple_regression.clj b/src/propeller/problems/simple_regression.clj index 5e569b4..1b710a2 100644 --- a/src/propeller/problems/simple_regression.clj +++ b/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] - [state :as state]) + [propeller.push.interpreter :as interpreter] + [propeller.push.state :as state] [propeller.tools.math :as math])) ;; ============================================================================= diff --git a/src/propeller/problems/string_classification.clj b/src/propeller/problems/string_classification.clj index 26ffded..4d1edf0 100644 --- a/src/propeller/problems/string_classification.clj +++ b/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] - [state :as state]))) + [propeller.push.interpreter :as interpreter] + [propeller.push.state :as state])) ;; ============================================================================= ;; String classification diff --git a/src/propeller/push/instructions/code.clj b/src/propeller/push/instructions/code.clj index 9ff1236..33e0a51 100644 --- a/src/propeller/push/instructions/code.clj +++ b/src/propeller/push/instructions/code.clj @@ -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 diff --git a/src/propeller/push/instructions/input_output.clj b/src/propeller/push/instructions/input_output.clj index 632b499..037b9af 100644 --- a/src/propeller/push/instructions/input_output.clj +++ b/src/propeller/push/instructions/input_output.clj @@ -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 diff --git a/src/propeller/push/instructions/polymorphic.clj b/src/propeller/push/instructions/polymorphic.clj index b878efd..9b2a21d 100644 --- a/src/propeller/push/instructions/polymorphic.clj +++ b/src/propeller/push/instructions/polymorphic.clj @@ -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 diff --git a/src/propeller/push/interpreter.clj b/src/propeller/push/interpreter.clj index 1fdd5a6..13006fc 100644 --- a/src/propeller/push/interpreter.clj +++ b/src/propeller/push/interpreter.clj @@ -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." diff --git a/src/propeller/push/utils.clj b/src/propeller/push/utils.clj index 1ab0aab..78ae855 100644 --- a/src/propeller/push/utils.clj +++ b/src/propeller/push/utils.clj @@ -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] diff --git a/src/propeller/session.clj b/src/propeller/session.clj index 31d98ad..9723240 100644 --- a/src/propeller/session.clj +++ b/src/propeller/session.clj @@ -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) diff --git a/src/propeller/tools/distributions.cljc b/src/propeller/tools/distributions.cljc index 323a9d2..8f69bc2 100644 --- a/src/propeller/tools/distributions.cljc +++ b/src/propeller/tools/distributions.cljc @@ -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