Changeset 480 for experiments/frams/multi-threading

Timestamp:

03/25/16 17:44:20 (8 years ago)

Author:

sz

Message:

experiment scripts updated to match the upcoming Framsticks version (ExpParams? ==> ExpProperties?, Fields ==> NeuroProperties?, prop: ==> property)

File:

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

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

@@ -5 +5 @@
 function main_args(complexify_geno,timeinterval,intervals)
 {
-        // ExpParams.mix_period (percentage of the gene pool capacity) is kept at the default value (1000%)
+        // ExpProperties.mix_period (percentage of the gene pool capacity) is kept at the default value (1000%)
 
         Math.randomize();
         //Simulator.expdef="standard-mt"; //set multithreaded experiment; this is done by the shell script
         
-        ExpParams.initialgen="XX[|,1:1][N,1:1,2:1][T][G]";
+        ExpProperties.initialgen="XX[|,1:1][N,1:1,2:1][T][G]";
         for(var i=0;i<complexify_geno;i++) //make a big genotype by doubling the simple one above. Note: exponential!
-                ExpParams.initialgen=ExpParams.initialgen+ExpParams.initialgen;
+                ExpProperties.initialgen=ExpProperties.initialgen+ExpProperties.initialgen;
         
         Simulator.init();
@@ -26 +26 @@
                 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("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 % ExpProperties.threads % ExpProperties.capacity);
                 Simulator.print(GenePools[0].best().genotype);
         }