[Swift-commit] r5740 - SwiftApps/SciColSim

[jonmon at ci.uchicago.edu]

Author: jonmon
Date: 2012-04-02 20:48:43 -0500 (Mon, 02 Apr 2012)
New Revision: 5740

Modified:
   SwiftApps/SciColSim/optimizer.cpp
   SwiftApps/SciColSim/swiftopt.sh
Log:
fixed syntax error for the command to python in swiftopt.sh
create workers directory in swiftwork to store the worker logs for runs with trunk
do not scale max loss value in optimizer.cpp



Modified: SwiftApps/SciColSim/optimizer.cpp
===================================================================
--- SwiftApps/SciColSim/optimizer.cpp	2012-03-30 17:14:31 UTC (rev 5739)
+++ SwiftApps/SciColSim/optimizer.cpp	2012-04-03 01:48:43 UTC (rev 5740)
@@ -1001,7 +1001,7 @@
 
             for(int i=0; i< N_epochs &&  current_novelty < TargetNovelty; i++){
 
-                if(ratio < max_loss_value((int)TargetNovelty)*2){
+                if(ratio < max_loss_value((int)TargetNovelty)){
                     update_world();
                 }
                 else{

Modified: SwiftApps/SciColSim/swiftopt.sh
===================================================================
--- SwiftApps/SciColSim/swiftopt.sh	2012-03-30 17:14:31 UTC (rev 5739)
+++ SwiftApps/SciColSim/swiftopt.sh	2012-04-03 01:48:43 UTC (rev 5740)
@@ -103,13 +103,14 @@
 echo
 
 # Echo runtime estimates
-total_jobs=`python -c "from math import ceil; print int(ceil(($max_target_innovation.00 - $min_target_innovation.00)/$target_innovation_increment.00) * $annealing_repeats * $variable_params * $annealing_cycles * $evolve_reruns/$reruns_per_opt_invocation"`
+total_jobs=`python -c "from math import ceil; print int(ceil(($max_target_innovation.00 - $min_target_innovation.00)/$target_innovation_increment.00) * $annealing_repeats * $variable_params * $annealing_cycles * $evolve_reruns/$reruns_per_opt_invocation)"`
 echo Total jobs = $total_jobs
 
 cd $rundir
 
 # Do the run
 export WORK=$PWD/swiftwork
+mkdir -p $PWD/swiftwork/workers
 
 # Use start-coaster-service if the site uses a .conf file
 if [ "$USE_SCS" == "1" ]; then