[Swift-commit] r5544 - SwiftApps/SciColSim

[jonmon at ci.uchicago.edu]

Author: jonmon
Date: 2012-02-02 13:00:16 -0600 (Thu, 02 Feb 2012)
New Revision: 5544

Modified:
   SwiftApps/SciColSim/README
   SwiftApps/SciColSim/annealing.swift
Log:
Updates to the REAMDE documentation.  Changed erruns to evoreruns in annealing.swift



Modified: SwiftApps/SciColSim/README
===================================================================
--- SwiftApps/SciColSim/README	2012-02-01 21:12:18 UTC (rev 5543)
+++ SwiftApps/SciColSim/README	2012-02-02 19:00:16 UTC (rev 5544)
@@ -140,21 +140,39 @@
 *** Parameter on the command line
     The command line options are:
         -nworkers=<int>
+
 	-minrange=<int>
+
 	-maxrange=<int>
+
 	-rangeinc=<int>
+
 	-tstart=<float>
+
 	-tend=<float>
+
 	-trejection=<float>
-	-erruns=<int>
+
+	-evoreruns=<int>
+
 	-startingjump=<float>
+	    Controls the dx and/or rejection variable
+
 	-alphai=<float>
+
 	-alpham=<float>
+
 	-beta=<float>
+
 	-gamma=<float>
+
 	-delta=<float>
+
 	-annealingcycles=<int>
+	    Number of times to run the annealing process for a given target innovation
+
 	-rerunsperapp=<int>
+	    Number of evolve reruns to do per app call
 
 
 

Modified: SwiftApps/SciColSim/annealing.swift
===================================================================
--- SwiftApps/SciColSim/annealing.swift	2012-02-01 21:12:18 UTC (rev 5543)
+++ SwiftApps/SciColSim/annealing.swift	2012-02-02 19:00:16 UTC (rev 5544)
@@ -301,7 +301,7 @@
 						   @tofloat(@arg("tstart", "2.0")),
 						   @tofloat(@arg("tend", "0.01")),
 						   @tofloat(@arg("trejection", "0.3")),
-						   @toint(@arg("erruns", "100")),
+						   @toint(@arg("evoreruns", "100")),
 						   @tofloat(@arg("startingjump", "2.3")),
 						   [@tofloat(@arg("alphai", "0.0")), @tofloat(@arg("alpham", "0.0")), @tofloat(@arg("beta", "4.0")), @tofloat(@arg("gamma", "50.0")), @tofloat(@arg("delta", "-1.0"))],
                                                     @tofloat(target_innov),