From 744ab184baac945acdee4e0c7aa533cc1729cc6a Mon Sep 17 00:00:00 2001
From: klingliu <klliu23@amherst.edu>
Date: Tue, 6 Jul 2021 17:44:45 -0400
Subject: [PATCH 1/3] Change outputs to turn instructions list into string for
the analysis scripts
---
.../Leiningen__clojure_complete_0_2_5.xml | 2 +-
.idea/libraries/Leiningen__nrepl_0_6_0.xml | 2 +-
.../Leiningen__org_clojure_clojure_1_10_0.xml | 2 +-
...ingen__org_clojure_core_specs_alpha_0_2_44.xml | 2 +-
.../Leiningen__org_clojure_spec_alpha_0_2_176.xml | 2 +-
propeller.iml | 3 ++-
results-summ.txt | Bin 0 -> 294 bytes
src/propeller/gp.cljc | 6 +++---
8 files changed, 10 insertions(+), 9 deletions(-)
create mode 100644 results-summ.txt
diff --git a/.idea/libraries/Leiningen__clojure_complete_0_2_5.xml b/.idea/libraries/Leiningen__clojure_complete_0_2_5.xml
index c6f5338..6494625 100644
--- a/.idea/libraries/Leiningen__clojure_complete_0_2_5.xml
+++ b/.idea/libraries/Leiningen__clojure_complete_0_2_5.xml
@@ -1,7 +1,7 @@
<component name="libraryTable">
<library name="Leiningen: clojure-complete:0.2.5">
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/clojure-complete/clojure-complete/0.2.5/clojure-complete-0.2.5.jar!/" />
+ <root url="jar://$USER_HOME$/.m2/repository/clojure-complete/clojure-complete/0.2.5/clojure-complete-0.2.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Leiningen__nrepl_0_6_0.xml b/.idea/libraries/Leiningen__nrepl_0_6_0.xml
index 5997b74..3e43f83 100644
--- a/.idea/libraries/Leiningen__nrepl_0_6_0.xml
+++ b/.idea/libraries/Leiningen__nrepl_0_6_0.xml
@@ -1,7 +1,7 @@
<component name="libraryTable">
<library name="Leiningen: nrepl:0.6.0">
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/nrepl/nrepl/0.6.0/nrepl-0.6.0.jar!/" />
+ <root url="jar://$USER_HOME$/.m2/repository/nrepl/nrepl/0.6.0/nrepl-0.6.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Leiningen__org_clojure_clojure_1_10_0.xml b/.idea/libraries/Leiningen__org_clojure_clojure_1_10_0.xml
index 513d335..f39da1f 100644
--- a/.idea/libraries/Leiningen__org_clojure_clojure_1_10_0.xml
+++ b/.idea/libraries/Leiningen__org_clojure_clojure_1_10_0.xml
@@ -1,7 +1,7 @@
<component name="libraryTable">
<library name="Leiningen: org.clojure/clojure:1.10.0">
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/clojure/clojure/1.10.0/clojure-1.10.0.jar!/" />
+ <root url="jar://$USER_HOME$/.m2/repository/org/clojure/clojure/1.10.0/clojure-1.10.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Leiningen__org_clojure_core_specs_alpha_0_2_44.xml b/.idea/libraries/Leiningen__org_clojure_core_specs_alpha_0_2_44.xml
index 0c20df3..e0318b5 100644
--- a/.idea/libraries/Leiningen__org_clojure_core_specs_alpha_0_2_44.xml
+++ b/.idea/libraries/Leiningen__org_clojure_core_specs_alpha_0_2_44.xml
@@ -1,7 +1,7 @@
<component name="libraryTable">
<library name="Leiningen: org.clojure/core.specs.alpha:0.2.44">
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/clojure/core.specs.alpha/0.2.44/core.specs.alpha-0.2.44.jar!/" />
+ <root url="jar://$USER_HOME$/.m2/repository/org/clojure/core.specs.alpha/0.2.44/core.specs.alpha-0.2.44.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Leiningen__org_clojure_spec_alpha_0_2_176.xml b/.idea/libraries/Leiningen__org_clojure_spec_alpha_0_2_176.xml
index 31c7656..faa18e9 100644
--- a/.idea/libraries/Leiningen__org_clojure_spec_alpha_0_2_176.xml
+++ b/.idea/libraries/Leiningen__org_clojure_spec_alpha_0_2_176.xml
@@ -1,7 +1,7 @@
<component name="libraryTable">
<library name="Leiningen: org.clojure/spec.alpha:0.2.176">
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/clojure/spec.alpha/0.2.176/spec.alpha-0.2.176.jar!/" />
+ <root url="jar://$USER_HOME$/.m2/repository/org/clojure/spec.alpha/0.2.176/spec.alpha-0.2.176.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/propeller.iml b/propeller.iml
index f3f76e0..efb4a86 100644
--- a/propeller.iml
+++ b/propeller.iml
@@ -5,8 +5,8 @@
<output-test url="file://$MODULE_DIR$/target/classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/dev-resources" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
@@ -23,6 +23,7 @@
<orderEntry type="library" name="Leiningen: com.google.javascript/closure-compiler-unshaded:v20170910" level="project" />
<orderEntry type="library" name="Leiningen: com.google.jsinterop/jsinterop-annotations:1.0.0" level="project" />
<orderEntry type="library" name="Leiningen: com.google.protobuf/protobuf-java:3.0.2" level="project" />
+ <orderEntry type="library" name="Leiningen: net.clojars.schneau/psb2:1.0.0" level="project" />
<orderEntry type="library" name="Leiningen: nrepl:0.6.0" level="project" />
<orderEntry type="library" name="Leiningen: org.clojure/clojure:1.10.0" level="project" />
<orderEntry type="library" name="Leiningen: org.clojure/clojurescript:1.9.946" level="project" />
diff --git a/results-summ.txt b/results-summ.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e1b84955985c99d7b09cf3a773cbbab6fe87db57
GIT binary patch
literal 294
zcma)1K@P$&4D)#sf7o$c5bZXg-1ZbSO%oCVi2~0DY}4IQ)HZP(JN>)|yfER86K1|O
zGM*S26SK@(=(R8&IOE3ZNIW26gNU|7hZQOexG?@x$<}G8QRBc9v9oUPe9yacPag6U
q9w0mzQLRoitG7lnlFZri7F!!GGd~siEK|zF)E3bmVz(t*`&VC6h$V;s
literal 0
HcmV?d00001
diff --git a/src/propeller/gp.cljc b/src/propeller/gp.cljc
index a849a93..11da7f9 100755
--- a/src/propeller/gp.cljc
+++ b/src/propeller/gp.cljc
@@ -34,7 +34,7 @@
max-initial-plushy-size]
:as argmap}]
;;
- (println {:starting-args argmap})
+ (prn {:starting-args (update (update argmap :error-function str) :instructions str)})
(println)
;;
(loop [generation 0
@@ -52,8 +52,8 @@
(cond
;; Success on training cases is verified on testing cases
(zero? (:total-error best-individual))
- (do (println {:success-generation generation})
- (println {:total-test-error (:total-error (error-function argmap best-individual :test))})
+ (do (prn {:success-generation generation})
+ (prn {:total-test-error (:total-error (error-function argmap best-individual :test))})
(#?(:clj shutdown-agents))
)
;;
From d92507b06285b65ec5fc1c6c66f7ea325328cfac Mon Sep 17 00:00:00 2001
From: klingliu <klliu23@amherst.edu>
Date: Tue, 6 Jul 2021 17:46:17 -0400
Subject: [PATCH 2/3] Revert "Change outputs to turn instructions list into
string for the analysis scripts"
This reverts commit 744ab184baac945acdee4e0c7aa533cc1729cc6a.
---
.../Leiningen__clojure_complete_0_2_5.xml | 2 +-
.idea/libraries/Leiningen__nrepl_0_6_0.xml | 2 +-
.../Leiningen__org_clojure_clojure_1_10_0.xml | 2 +-
...ingen__org_clojure_core_specs_alpha_0_2_44.xml | 2 +-
.../Leiningen__org_clojure_spec_alpha_0_2_176.xml | 2 +-
propeller.iml | 3 +--
results-summ.txt | Bin 294 -> 0 bytes
src/propeller/gp.cljc | 6 +++---
8 files changed, 9 insertions(+), 10 deletions(-)
delete mode 100644 results-summ.txt
diff --git a/.idea/libraries/Leiningen__clojure_complete_0_2_5.xml b/.idea/libraries/Leiningen__clojure_complete_0_2_5.xml
index 6494625..c6f5338 100644
--- a/.idea/libraries/Leiningen__clojure_complete_0_2_5.xml
+++ b/.idea/libraries/Leiningen__clojure_complete_0_2_5.xml
@@ -1,7 +1,7 @@
<component name="libraryTable">
<library name="Leiningen: clojure-complete:0.2.5">
<CLASSES>
- <root url="jar://$USER_HOME$/.m2/repository/clojure-complete/clojure-complete/0.2.5/clojure-complete-0.2.5.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/clojure-complete/clojure-complete/0.2.5/clojure-complete-0.2.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Leiningen__nrepl_0_6_0.xml b/.idea/libraries/Leiningen__nrepl_0_6_0.xml
index 3e43f83..5997b74 100644
--- a/.idea/libraries/Leiningen__nrepl_0_6_0.xml
+++ b/.idea/libraries/Leiningen__nrepl_0_6_0.xml
@@ -1,7 +1,7 @@
<component name="libraryTable">
<library name="Leiningen: nrepl:0.6.0">
<CLASSES>
- <root url="jar://$USER_HOME$/.m2/repository/nrepl/nrepl/0.6.0/nrepl-0.6.0.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/nrepl/nrepl/0.6.0/nrepl-0.6.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Leiningen__org_clojure_clojure_1_10_0.xml b/.idea/libraries/Leiningen__org_clojure_clojure_1_10_0.xml
index f39da1f..513d335 100644
--- a/.idea/libraries/Leiningen__org_clojure_clojure_1_10_0.xml
+++ b/.idea/libraries/Leiningen__org_clojure_clojure_1_10_0.xml
@@ -1,7 +1,7 @@
<component name="libraryTable">
<library name="Leiningen: org.clojure/clojure:1.10.0">
<CLASSES>
- <root url="jar://$USER_HOME$/.m2/repository/org/clojure/clojure/1.10.0/clojure-1.10.0.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/clojure/clojure/1.10.0/clojure-1.10.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Leiningen__org_clojure_core_specs_alpha_0_2_44.xml b/.idea/libraries/Leiningen__org_clojure_core_specs_alpha_0_2_44.xml
index e0318b5..0c20df3 100644
--- a/.idea/libraries/Leiningen__org_clojure_core_specs_alpha_0_2_44.xml
+++ b/.idea/libraries/Leiningen__org_clojure_core_specs_alpha_0_2_44.xml
@@ -1,7 +1,7 @@
<component name="libraryTable">
<library name="Leiningen: org.clojure/core.specs.alpha:0.2.44">
<CLASSES>
- <root url="jar://$USER_HOME$/.m2/repository/org/clojure/core.specs.alpha/0.2.44/core.specs.alpha-0.2.44.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/clojure/core.specs.alpha/0.2.44/core.specs.alpha-0.2.44.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Leiningen__org_clojure_spec_alpha_0_2_176.xml b/.idea/libraries/Leiningen__org_clojure_spec_alpha_0_2_176.xml
index faa18e9..31c7656 100644
--- a/.idea/libraries/Leiningen__org_clojure_spec_alpha_0_2_176.xml
+++ b/.idea/libraries/Leiningen__org_clojure_spec_alpha_0_2_176.xml
@@ -1,7 +1,7 @@
<component name="libraryTable">
<library name="Leiningen: org.clojure/spec.alpha:0.2.176">
<CLASSES>
- <root url="jar://$USER_HOME$/.m2/repository/org/clojure/spec.alpha/0.2.176/spec.alpha-0.2.176.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/clojure/spec.alpha/0.2.176/spec.alpha-0.2.176.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/propeller.iml b/propeller.iml
index efb4a86..f3f76e0 100644
--- a/propeller.iml
+++ b/propeller.iml
@@ -5,8 +5,8 @@
<output-test url="file://$MODULE_DIR$/target/classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/dev-resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/dev-resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
@@ -23,7 +23,6 @@
<orderEntry type="library" name="Leiningen: com.google.javascript/closure-compiler-unshaded:v20170910" level="project" />
<orderEntry type="library" name="Leiningen: com.google.jsinterop/jsinterop-annotations:1.0.0" level="project" />
<orderEntry type="library" name="Leiningen: com.google.protobuf/protobuf-java:3.0.2" level="project" />
- <orderEntry type="library" name="Leiningen: net.clojars.schneau/psb2:1.0.0" level="project" />
<orderEntry type="library" name="Leiningen: nrepl:0.6.0" level="project" />
<orderEntry type="library" name="Leiningen: org.clojure/clojure:1.10.0" level="project" />
<orderEntry type="library" name="Leiningen: org.clojure/clojurescript:1.9.946" level="project" />
diff --git a/results-summ.txt b/results-summ.txt
deleted file mode 100644
index e1b84955985c99d7b09cf3a773cbbab6fe87db57..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 294
zcma)1K@P$&4D)#sf7o$c5bZXg-1ZbSO%oCVi2~0DY}4IQ)HZP(JN>)|yfER86K1|O
zGM*S26SK@(=(R8&IOE3ZNIW26gNU|7hZQOexG?@x$<}G8QRBc9v9oUPe9yacPag6U
q9w0mzQLRoitG7lnlFZri7F!!GGd~siEK|zF)E3bmVz(t*`&VC6h$V;s
diff --git a/src/propeller/gp.cljc b/src/propeller/gp.cljc
index 11da7f9..a849a93 100755
--- a/src/propeller/gp.cljc
+++ b/src/propeller/gp.cljc
@@ -34,7 +34,7 @@
max-initial-plushy-size]
:as argmap}]
;;
- (prn {:starting-args (update (update argmap :error-function str) :instructions str)})
+ (println {:starting-args argmap})
(println)
;;
(loop [generation 0
@@ -52,8 +52,8 @@
(cond
;; Success on training cases is verified on testing cases
(zero? (:total-error best-individual))
- (do (prn {:success-generation generation})
- (prn {:total-test-error (:total-error (error-function argmap best-individual :test))})
+ (do (println {:success-generation generation})
+ (println {:total-test-error (:total-error (error-function argmap best-individual :test))})
(#?(:clj shutdown-agents))
)
;;
From d47bfc4aaf15f662952efca6bbc5a124e963682a Mon Sep 17 00:00:00 2001
From: klingliu <klliu23@amherst.edu>
Date: Tue, 6 Jul 2021 17:56:50 -0400
Subject: [PATCH 3/3] Change instructions output to string format for analysis
scripts
---
src/propeller/gp.cljc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/propeller/gp.cljc b/src/propeller/gp.cljc
index a849a93..11da7f9 100755
--- a/src/propeller/gp.cljc
+++ b/src/propeller/gp.cljc
@@ -34,7 +34,7 @@
max-initial-plushy-size]
:as argmap}]
;;
- (println {:starting-args argmap})
+ (prn {:starting-args (update (update argmap :error-function str) :instructions str)})
(println)
;;
(loop [generation 0
@@ -52,8 +52,8 @@
(cond
;; Success on training cases is verified on testing cases
(zero? (:total-error best-individual))
- (do (println {:success-generation generation})
- (println {:total-test-error (:total-error (error-function argmap best-individual :test))})
+ (do (prn {:success-generation generation})
+ (prn {:total-test-error (:total-error (error-function argmap best-individual :test))})
(#?(:clj shutdown-agents))
)
;;