rowan.a.tl/propeller
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

path function changed

Browse Source
This commit is contained in:
Shuzo Katayama 2021-07-01 18:04:18 -04:00
parent a831990c35
commit 829b41e253
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/propeller/core.cljc
View File

@ -3,6 +3,7 @@
(:require [propeller.gp :as gp]
[propeller.problems.simple-regression :as regression]
[propeller.problems.string-classification :as string-classif]
[clojure.string :as string]
#?(:cljs [cljs.reader :refer [read-string]])))
(defn eval-problem-var
@ -19,14 +20,11 @@
(println " lein run software.smallest")
(System/exit 1))
;; Setting the path for PSB2
(when (= (first args) "PSB2-set-path")
(spit "PSB2_path.txt" (second args))
(println (str "Set path to PSB2 as " (second args)))
(System/exit 1))
;; Creates problems
(require (symbol (str "propeller.problems." (first args))))
(when (string/includes? (first args) "PSB2")
(spit "PSB2_path.txt" (second args))
(println (str "Set path to PSB2 as " (second args))))
(gp/gp
(update-in
(merge
@ -42,7 +40,10 @@
:variation {:umad 0.5 :crossover 0.5}
:elitism false}
(apply hash-map
(map #(if (string? %) (read-string %) %)
(rest args))))
(if (string/includes? (first args) "PSB2")
(map #(if (string? %) (read-string %) %)
(rest (remove #(= % (second args)) args)))
(map #(if (string? %) (read-string %) %)
(rest args)))))
[:error-function]
identity)))