Changeset 462 for experiments/frams

Timestamp:

02/03/16 23:12:23 (9 years ago)

Author:

Maciej Komosinski

Message:

• Updated for a new official way of calling scripts with arguments
• Prints more comprehensive statistics

File:

• experiments/frams/multi-threading/data/scripts/test-mt.script (modified) (2 diffs)

experiments/frams/multi-threading/data/scripts/test-mt.script

@@ -3 +3 @@
 help:Multithreading efficiency test
 code:~
-function main(complexify_geno,timeinterval,intervals)
+function main_args(complexify_geno,timeinterval,intervals)
 {
         // ExpParams.mix_period (percentage of the gene pool capacity) is kept at the default value (1000%)
@@ -17 +17 @@
         //Simulator.print(GenePools[0][0].genotype); //ensure that the initialgen is in the gene pool - init() does this
                 
+        var t0=Math.time;
+        var next_pause;
         Simulator.start();
         for(var iter=0;iter<intervals;iter++)
         {
-                var t0=Math.time;
-                while (Math.time-t0<timeinterval && Simulator.running) Simulator.step(); 
-                Simulator.print("iter=%d, simsteps=%d, evals=%d, migrations=%d, gen_count=%d, avg_numparts=%g, fit_avg=%g, fit_max=%g" % iter % Simulator.time % ExpState.totaltests % ExpState.migrations % stats.gen_count % stats.st_avg_numparts % stats.st_avg_fit % stats.st_max_fit);
+                next_pause=Math.time+timeinterval;
+                while (Math.time<next_pause && Simulator.running) Simulator.step(); 
+                if (iter==(intervals-1))
+                    Simulator.stop();
+                Simulator.print("iter=%d, simsteps=%d, evals=%d, migrations=%d, gen_count=%d, avg_numparts=%g, fit_avg=%g, fit_max=%g, time=%f, migration_time=%f, T=%d, C=%d" % iter % Simulator.stepNumber % ExpState.totaltests % ExpState.migrations % stats.gen_count % stats.st_avg_numparts % stats.st_avg_fit % stats.st_max_fit % (Math.time-t0) % ExpState.migration_time % ExpParams.threads % ExpParams.capacity);
                 Simulator.print(GenePools[0].best().genotype);
         }
-        Simulator.stop();
 }
 ~