jonklein · deric · Feb 23, 2015 · Feb 23, 2015 · Feb 23, 2015 · Feb 23, 2015
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
-*.class
-.project
-.classpath
+*.class
+.project
+.classpath
 /Run from CEFloatReg2
+/target/
diff --git a/Makefile b/Makefile
diff --git a/Manifest b/Manifest
diff --git a/PshEquationBuilder.java b/PshEquationBuilder.java
diff --git a/PshInspector.java b/PshInspector.java
diff --git a/README.md b/README.md
@@ -42,23 +42,33 @@ Getting Started with Psh
 
 Building Psh
 ------------
-After getting Psh with get, build the package:
+After downloading the source code from git, build the package with Maven (preferably version 3):
 
-    $ make
+    $ mvn install
+
+Which will create a JAR file in folder `target/`.
+
+And run tests with
+
+    $ mvn test
 
 Using PshGP
 ----------
 To run PshGP on a sample problem:
 
-    $ java PshGP gpsamples/intreg1.pushgp
+    $ ./pshgp examples/gpsamples/cartcenter.pushgp
+
+or directly with Java command
+
+    $ java -jar target/psh-*.jar examples/gpsamples/cartcenter.pushgp
 
-This problem uses integer symbolic regression to solve the equation y = 12x^2 + 5. Other sample problems are available, with descriptions, in `gpsamples/`. For example, `intreg2.pushgp` uses integer symbolic regression to solve the factorial function, and `regression1.pushgp` uses float symbolic regression to solve y = 12x^2 + 5.
+This problem uses integer symbolic regression to solve the equation `y = 12x^2 + 5`. Other sample problems are available, with descriptions, in `gpsamples/`. For example, `intreg2.pushgp` uses integer symbolic regression to solve the factorial function, and `regression1.pushgp` uses float symbolic regression to solve `y = 12x^2 + 5`.
 
 Using PshInspector
 ------------------
 PshInspector allows you to examine every step of a Psh program as it executes. To run PshInspector on a sample psh program:
 
-    $ java PshInspector pushsamples/exampleProgram1.push
+    $ ./pshinspector examples/pushsamples/exampleProgram1.push
 
 This push file runs the psh program `(2994 5 integer.+)` for 100 steps after pushing the inputs `44, 22, true, 17.76`. Other sample psh programs are available in `pushsamples/`.
 
@@ -209,4 +219,4 @@ Major Changes since v0.1:
 
 Acknowledgement
 ===============
-This material is based upon work supported by the National Science Foundation under Grant No. 1017817. Any opinions, findings, and conclusions or recommendations expressed in this publication are those of the authors and do not necessarily reflect the views of the National Science Foundation.
+This material is based upon work supported by the National Science Foundation under Grant No. 1017817. Any opinions, findings, and conclusions or recommendations expressed in this publication are those of the authors and do not necessarily reflect the views of the National Science Foundation.
diff --git a/coevolution/CEFloatReg1.pushgp → examples/coevolution/CEFloatReg1.pushgp b/coevolution/CEFloatReg1.pushgp → examples/coevolution/CEFloatReg1.pushgp
diff --git a/coevolution/CEFloatReg2.pushgp → examples/coevolution/CEFloatReg2.pushgp b/coevolution/CEFloatReg2.pushgp → examples/coevolution/CEFloatReg2.pushgp
diff --git a/coevolution/DifficultFloatReg1.pushgp → ...les/coevolution/DifficultFloatReg1.pushgp b/coevolution/DifficultFloatReg1.pushgp → ...les/coevolution/DifficultFloatReg1.pushgp
diff --git a/coevolution/DifficultFloatReg2.pushgp → ...les/coevolution/DifficultFloatReg2.pushgp b/coevolution/DifficultFloatReg2.pushgp → ...les/coevolution/DifficultFloatReg2.pushgp
diff --git a/coevolution/DifficultIntReg1.pushgp → examples/coevolution/DifficultIntReg1.pushgp b/coevolution/DifficultIntReg1.pushgp → examples/coevolution/DifficultIntReg1.pushgp
diff --git a/gpsamples/cartcenter.pushgp → examples/gpsamples/cartcenter.pushgp b/gpsamples/cartcenter.pushgp → examples/gpsamples/cartcenter.pushgp
diff --git a/gpsamples/floatreg0.pushgp → examples/gpsamples/floatreg0.pushgp b/gpsamples/floatreg0.pushgp → examples/gpsamples/floatreg0.pushgp
diff --git a/gpsamples/floatreg1.pushgp → examples/gpsamples/floatreg1.pushgp b/gpsamples/floatreg1.pushgp → examples/gpsamples/floatreg1.pushgp
diff --git a/gpsamples/floatreg2.pushgp → examples/gpsamples/floatreg2.pushgp b/gpsamples/floatreg2.pushgp → examples/gpsamples/floatreg2.pushgp
diff --git a/gpsamples/floatreg3.pushgp → examples/gpsamples/floatreg3.pushgp b/gpsamples/floatreg3.pushgp → examples/gpsamples/floatreg3.pushgp
diff --git a/gpsamples/intreg0.pushgp → examples/gpsamples/intreg0.pushgp b/gpsamples/intreg0.pushgp → examples/gpsamples/intreg0.pushgp
diff --git a/gpsamples/intreg1.pushgp → examples/gpsamples/intreg1.pushgp b/gpsamples/intreg1.pushgp → examples/gpsamples/intreg1.pushgp
diff --git a/gpsamples/intreg2.pushgp → examples/gpsamples/intreg2.pushgp b/gpsamples/intreg2.pushgp → examples/gpsamples/intreg2.pushgp
diff --git a/gpsamples/nodeselectiontesting.pushgp → ...les/gpsamples/nodeselectiontesting.pushgp b/gpsamples/nodeselectiontesting.pushgp → ...les/gpsamples/nodeselectiontesting.pushgp
diff --git a/gpsamples/standard.pushgp → examples/gpsamples/standard.pushgp b/gpsamples/standard.pushgp → examples/gpsamples/standard.pushgp
diff --git a/...es/trival-gp-problemset/problemset.pushgp → ...es/trival-gp-problemset/problemset.pushgp b/...es/trival-gp-problemset/problemset.pushgp → ...es/trival-gp-problemset/problemset.pushgp
diff --git a/...s/trival-gp-problemset/regression1.pushgp → ...s/trival-gp-problemset/regression1.pushgp b/...s/trival-gp-problemset/regression1.pushgp → ...s/trival-gp-problemset/regression1.pushgp
diff --git a/.../trival-gp-problemset/regression10.pushgp → .../trival-gp-problemset/regression10.pushgp b/.../trival-gp-problemset/regression10.pushgp → .../trival-gp-problemset/regression10.pushgp
diff --git a/...s/trival-gp-problemset/regression2.pushgp → ...s/trival-gp-problemset/regression2.pushgp b/...s/trival-gp-problemset/regression2.pushgp → ...s/trival-gp-problemset/regression2.pushgp
diff --git a/...s/trival-gp-problemset/regression3.pushgp → ...s/trival-gp-problemset/regression3.pushgp b/...s/trival-gp-problemset/regression3.pushgp → ...s/trival-gp-problemset/regression3.pushgp
diff --git a/...s/trival-gp-problemset/regression4.pushgp → ...s/trival-gp-problemset/regression4.pushgp b/...s/trival-gp-problemset/regression4.pushgp → ...s/trival-gp-problemset/regression4.pushgp
diff --git a/...s/trival-gp-problemset/regression5.pushgp → ...s/trival-gp-problemset/regression5.pushgp b/...s/trival-gp-problemset/regression5.pushgp → ...s/trival-gp-problemset/regression5.pushgp
diff --git a/...s/trival-gp-problemset/regression6.pushgp → ...s/trival-gp-problemset/regression6.pushgp b/...s/trival-gp-problemset/regression6.pushgp → ...s/trival-gp-problemset/regression6.pushgp
diff --git a/...s/trival-gp-problemset/regression7.pushgp → ...s/trival-gp-problemset/regression7.pushgp b/...s/trival-gp-problemset/regression7.pushgp → ...s/trival-gp-problemset/regression7.pushgp
diff --git a/...s/trival-gp-problemset/regression8.pushgp → ...s/trival-gp-problemset/regression8.pushgp b/...s/trival-gp-problemset/regression8.pushgp → ...s/trival-gp-problemset/regression8.pushgp
diff --git a/...s/trival-gp-problemset/regression9.pushgp → ...s/trival-gp-problemset/regression9.pushgp b/...s/trival-gp-problemset/regression9.pushgp → ...s/trival-gp-problemset/regression9.pushgp
diff --git a/pushevolved/cartCenteringEvolved.push → ...les/pushevolved/cartCenteringEvolved.push b/pushevolved/cartCenteringEvolved.push → ...les/pushevolved/cartCenteringEvolved.push
diff --git a/pushevolved/cefloatreg2evolved.push → examples/pushevolved/cefloatreg2evolved.push b/pushevolved/cefloatreg2evolved.push → examples/pushevolved/cefloatreg2evolved.push
diff --git a/pushevolved/factorialEvolved.push → examples/pushevolved/factorialEvolved.push b/pushevolved/factorialEvolved.push → examples/pushevolved/factorialEvolved.push
diff --git a/pushsamples/exampleProgram0.push → examples/pushsamples/exampleProgram0.push b/pushsamples/exampleProgram0.push → examples/pushsamples/exampleProgram0.push
diff --git a/pushsamples/exampleProgram1.push → examples/pushsamples/exampleProgram1.push b/pushsamples/exampleProgram1.push → examples/pushsamples/exampleProgram1.push
diff --git a/pushsamples/exampleProgram2.push → examples/pushsamples/exampleProgram2.push b/pushsamples/exampleProgram2.push → examples/pushsamples/exampleProgram2.push
diff --git a/pushsamples/exampleProgram3.push → examples/pushsamples/exampleProgram3.push b/pushsamples/exampleProgram3.push → examples/pushsamples/exampleProgram3.push
diff --git a/pushsamples/instructionTesting.push → examples/pushsamples/instructionTesting.push b/pushsamples/instructionTesting.push → examples/pushsamples/instructionTesting.push
diff --git a/pushsamples/random.push → examples/pushsamples/random.push b/pushsamples/random.push → examples/pushsamples/random.push