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

[jonmon at ci.uchicago.edu]

Author: jonmon
Date: 2012-02-22 17:24:05 -0600 (Wed, 22 Feb 2012)
New Revision: 5672

Added:
   SwiftApps/SciColSim/params/ARtest02
Modified:
   SwiftApps/SciColSim/swiftopt.sh
Log:
o added params/ARtest02 which runs 10K evolution reruns for target innovations 58 and 108
o modified swiftopt.sh to copy the .swift files to the run directory as well



Added: SwiftApps/SciColSim/params/ARtest02
===================================================================
--- SwiftApps/SciColSim/params/ARtest02	                        (rev 0)
+++ SwiftApps/SciColSim/params/ARtest02	2012-02-22 23:24:05 UTC (rev 5672)
@@ -0,0 +1,18 @@
+
+min_target_innovation        58     # starting target innovation value to try
+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             100    # times to perform the simulated annealing loop for all non-fixed parameters
+
+evolve_reruns                10000   # times to perform evolve_to_target_and_save() (objective function - is batched)
+nworkers                     24      # number of parallel threads (cores) to use per invocation of C++ optimizer
+reruns_per_opt_invocation    240     # 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
+beta                         4.0     # rest are varied by the optimization process
+gamma                        50.0
+delta                        -1.0 
+ 

Modified: SwiftApps/SciColSim/swiftopt.sh
===================================================================
--- SwiftApps/SciColSim/swiftopt.sh	2012-02-22 23:15:40 UTC (rev 5671)
+++ SwiftApps/SciColSim/swiftopt.sh	2012-02-22 23:24:05 UTC (rev 5672)
@@ -11,7 +11,7 @@
 
 # Function to run Swift
 runswift() {
-   SWIFT_HEAP_MAX=$ram SWIFT_LIB=.. $swift >> swift.out 2>&1 -tc.file tc.data -sites.file $1 -config cf ../annealing.swift -e33="$escapecode" \
+   SWIFT_HEAP_MAX=$ram SWIFT_LIB=.. $swift >> swift.out 2>&1 -tc.file tc.data -sites.file $1 -config cf annealing.swift -e33="$escapecode" \
                                             \
    -minrange=$min_target_innovation         \
    -maxrange=$max_target_innovation         \
@@ -98,6 +98,9 @@
 fi
 
 cp movie_graph.txt $rundir
+cp annealing.swift $rundir
+cp colortext.swift $rundir
+cp math.swift $rundir
 
 # Echo parameters
 echo Annealing parameters:
@@ -131,7 +134,7 @@
 echo "Run dir=$rundir" >> ABOUT
 echo "Work dir=$WORK" >> ABOUT
 echo "Total jobs=$total_jobs" >> ABOUT
-echo "Run Command: SWIFT_HEAP_MAX=$ram SWIFT_LIB=.. $swift >> swift.out 2>&1 -tc.file tc.data -sites.file $1 -config cf ../annealing.swift -e33="$escapecode" -minrange=$min_target_innovation -maxrange=$max_target_innovation-rangeinc=$target_innovation_increment -nreps=$annealing_repeats -annealingcycles=$annealing_cycles -evoreruns=$evolve_reruns -alphai=$alpha_i -alpham=$alpha_m -beta=$beta -gamma=$gamma -delta=$delta -nworkers=$nworkers -rerunsperapp=$reruns_per_opt_invocation " >> ABOUT
+echo "Run Command: SWIFT_HEAP_MAX=$ram SWIFT_LIB=.. $swift >> swift.out 2>&1 -tc.file tc.data -sites.file $1 -config cf annealing.swift -e33="$escapecode" -minrange=$min_target_innovation -maxrange=$max_target_innovation-rangeinc=$target_innovation_increment -nreps=$annealing_repeats -annealingcycles=$annealing_cycles -evoreruns=$evolve_reruns -alphai=$alpha_i -alpham=$alpha_m -beta=$beta -gamma=$gamma -delta=$delta -nworkers=$nworkers -rerunsperapp=$reruns_per_opt_invocation " >> ABOUT
 
 if [ _$dryrun != _ ]; then
   exit 0