[Swift-commit] r5577 - in SwiftApps/SciColSim: . params

[wilde at ci.uchicago.edu]

Author: wilde
Date: 2012-02-09 18:39:07 -0600 (Thu, 09 Feb 2012)
New Revision: 5577

Modified:
   SwiftApps/SciColSim/params/Fast01
   SwiftApps/SciColSim/swiftopt.sh
Log:
Correct some param passing errors from swiftop.sh to swift command line.

Modified: SwiftApps/SciColSim/params/Fast01
===================================================================
--- SwiftApps/SciColSim/params/Fast01	2012-02-10 00:09:47 UTC (rev 5576)
+++ SwiftApps/SciColSim/params/Fast01	2012-02-10 00:39:07 UTC (rev 5577)
@@ -1,14 +1,14 @@
 
 min_target_innovation         58     # starting target innovation value to try
-max_target_innovation         209    # stops before this target innovation value
+max_target_innovation         109    # stops before this target innovation value
 target_innovation_increment   50     # increment target innovation by this amount 
 
 annealing_repeats             1      # times to repeate the entire optimization process for each target_innovation
 annealing_cycles              10     # times to perform the simulated annealing loop for all non-fixed parameters
 
-evolve_reruns                 10     # times to perform evolve_to_target_and_save() (objective function - is batched)
-nworkers                      2      # number of parallel threads (cores) to use per invocation of C++ optimizer
-reruns_per_opt_invocation     100    # reruns_per_opt_invocation mod nworkers must == 0 !!! <=== NOTE WELL !!!
+evolve_reruns                 8      # times to perform evolve_to_target_and_save() (objective function - is batched)
+nworkers                      1      # number of parallel threads (cores) to use per invocation of C++ optimizer
+reruns_per_opt_invocation     2      # reruns_per_opt_invocation mod nworkers must == 0 !!! <=== NOTE WELL !!!
 
 alpha_i                       0.0    # 5 evolve() parameters: must be decimal values !!!
 alpha_m                       0.0    # alpha_i and alpha_m are fixed for now

Modified: SwiftApps/SciColSim/swiftopt.sh
===================================================================
--- SwiftApps/SciColSim/swiftopt.sh	2012-02-10 00:09:47 UTC (rev 5576)
+++ SwiftApps/SciColSim/swiftopt.sh	2012-02-10 00:39:07 UTC (rev 5577)
@@ -81,7 +81,7 @@
                                          \
 -nreps=$annealing_repeats                \
 -annealingcycles=$annealing_cycles       \
--evolvereruns=$evolve_reruns             \
+-evoreruns=$evolve_reruns                \
                                          \
 -alphai=$alpha_i                         \
 -alpham=$alpha_m                         \
@@ -91,4 +91,25 @@
                                          \
 -nworkers=$nworkers                      \
 -rerunsperapp=$reruns_per_opt_invocation
- 
+
+exit 
+
+ at arg("nworkers","4")
+ at arg("rerunsperapp", "100")
+ at arg("seed", "0" )          FIXME
+ at arg("minrange", "58")
+ at arg("maxrange", "59")
+ at arg("rangeinc", "50")
+ at arg("nreps", "1")
+ at arg("tstart", "2.0")       FIXME
+ at arg("tend", "0.01")        FIXME
+ at arg("trejection", "0.3")   FIXME
+ at arg("evoreruns", "100")
+ at arg("startingjump", "2.3") FIXME
+ at arg("alphai", "0.0")
+ at arg("alpham", "0.0")
+ at arg("beta", "4.0")
+ at arg("gamma", "50.0")
+ at arg("delta", "-1.0")
+ at arg("annealingcycles", "50")
+