Changeset 432 for experiments/frams/foraminifera/data/scripts/foraminifera.expdef

Timestamp:

09/08/15 23:37:28 (9 years ago)

Author:

oriona

Message:

Minor corrections, hibernation gene value changed to 1, param for stopping simulation added

File:

• experiments/frams/foraminifera/data/scripts/foraminifera.expdef (modified) (12 diffs)

experiments/frams/foraminifera/data/scripts/foraminifera.expdef

@@ -13 +13 @@
 max_energy_level - maximum energy level reached so far
 gen - generation: 0 haploid, 1 diploid
-species - species: 0 hibernating 1 not hibernating
-hibernated - 0/1 foram isn't/is hibernated
+species - species: 0 not hibernating 1 hibernating
+hibernated - 0/1 foram is/isn't hibernated
 reproduce - 0/1 foram isn't/is ready for reproduction 
 ~
@@ -81 +81 @@
         //world
         SignalView.mode = 1;
-        ExpParams.world_size = scale(40000);
         World.wrldwat = 200;
-        World.wrldsiz = ExpParams.world_size;
+        World.wrldsiz = scale(40000);
         World.wrldbnd = 1;
         ExpParams.stress = 1;
@@ -138 +137 @@
         ExpState.totaltestedcr = 0;
         ExpState.nutrient = "";
+
+        ExpParams.iter = 0;
 }
 
@@ -236 +237 @@
         ExpState.nutrient = tmpvec;
         File.writeObject(sim_params.*);
-        ExpState.nutrient = null; //vectors are only created for saving and then discardedsetForam
+        ExpState.nutrient = null; //vectors are only created for saving and then discarded
 
         for (var cr in Populations[0])
@@ -387 +388 @@
         else if (cr.lifespan%dir_change == 0)
         {
-                var dir = (Math.rndUni(-ExpParams.zone2_range, ExpParams.zone2_range), Math.rndUni(-ExpParams.zone2_range, ExpParams.zone2_range), 0);//(0.1 * Math.rnd01, 0.1 * Math.rnd01, 0);        
+                var dir = (Math.rndUni(-ExpParams.zone2_range, ExpParams.zone2_range), Math.rndUni(-ExpParams.zone2_range, ExpParams.zone2_range), 0);  
                 dir.normalize();
                 dir.scale(-0.08);
@@ -485 +486 @@
 function onNutrientsStep(cr)
 {
-        cr.moveAbs(cr.pos_x % ExpParams.world_size, cr.pos_y % ExpParams.world_size, -ExpParams.zone1_range+0.5);
+        cr.moveAbs(cr.pos_x % World.wrldsiz, cr.pos_y % World.wrldsiz, -ExpParams.zone1_range+0.5);
 }
 
@@ -509 +510 @@
         {
                 for (var i = 0; i < ExpParams.nutrientPop; i++)
-                {
+                {    
                         addNutrient();
                 }
@@ -524 +525 @@
 function onStep()
 {
+
+        nutrientGrowth();
         if (ExpParams.logging == 1)
         {
                 createStatistics();
         }
-
-        nutrientGrowth();
 
         //reproduction --------------------------------------------
@@ -554 +555 @@
                 }
         }
-
+        if (ExpParams.stopping == 1)
+        {
+                if (Simulator.stepNumber == 150000)
+                        Simulator.stop();
+        }
 }
 
@@ -579 +584 @@
         }
 
-        var log_numbers = [number[0][0], number[0][1], number[1][0], number[1][1], Populations[1].size];
-        var log_energies = [e_inc[0][0], e_inc[0][1], e_inc[1][0], e_inc[1][1], e_nut];
+        var log_numbers = [number[1][0], number[1][1], number[0][0], number[0][1], Populations[1].size];
+        var log_energies = [e_inc[1][0], e_inc[1][1], e_inc[0][0], e_inc[0][1], e_nut];
 
         log(log_numbers, "forams_log.txt");
-        log(log_energies, "energies_log.txt");
+        log(log_energies,  "energies_log.txt");
 }
 
@@ -609 +614 @@
 type:d 0 1 0
 group:Foraminifera
+
+prop:
+id:iter
+name:Iteration number
+type:d
+
+prop:
+id:stopping
+name:Stop after the given number of simulation steps
+type:d 0 1 0
 
 prop:
@@ -785 +800 @@
 group:Energy
 type:d 1 1000 10
-
-prop:
-id:world_size
-name:World size
-type:d 10 10000 20
-group:World
 
 prop: