Changeset 554 for experiments/frams/foraminifera/data/scripts/foraminifera.inc

Timestamp:

07/31/16 23:26:43 (9 years ago)

Author:

oriona

Message:

Refactoring, change of foraminifera direction at world boundary added.

File:

• experiments/frams/foraminifera/data/scripts/foraminifera.inc (modified) (6 diffs)

experiments/frams/foraminifera/data/scripts/foraminifera.inc

@@ -30 +30 @@
 function createForamMorphology(morphotype, gen, chamber_num)
 {
-        var rad = getProperty(gen, "chamber_proculus"); 
         var geno = "//0\nm:Vstyle=foram\n" + chambers[morphotype][0] + "vr=" + colors[gen];
 
@@ -37 +36 @@
         for (var i = 0; i < chamber_num; i++)
         {
-                //rad = getProperty(gen, "chamber_proculus") + getProperty(gen, "chamber_difference") * (i + 1);
                 geno += "\n" + chambers[morphotype][i+1]  + "vr=" +  colors[gen];
         }
@@ -46 +44 @@
         }
 
-        //if (morphotype == 0) geno += "\nn:p=0,d=\"S\"";
         return geno;
 }
@@ -52 +49 @@
 function setGenotype(mode)
 {
-        if (mode->opt == 0) //initial
-        {
-                mode->cr.data->genes = String.deserialize(String.serialize(mode->genes)); 
-                mode->cr.data->lifeparams = {"max_energy_level" : mode->energy0, "gen" : 0,  "hibernated" : 0, "species" : mode->species, "reproduce" : 0, "dir" : randomDir(), "dir_counter" : Math.random(ExpProperties.dir_change_sec), "chamber_growth" : -1, "division_time" : -1};
-        }
-        else if (mode->opt  == 1) //child
-        {
-                mode->cr.data->lifeparams = {"max_energy_level" : mode->energy0, "gen" : 1 - mode->parent_lifeparams->gen,  "hibernated" : 0, "species" : mode->parent_lifeparams->species, "reproduce" : 0, "dir" : randomDir(), "dir_counter" : Math.random(ExpProperties.dir_change_sec), "chamber_growth" : -1, "division_time" : -1};
-                mode->cr.data->genes = String.deserialize(String.serialize(mode->parent_genes));
-        }
-        else //grow
+        if (mode->opt == "growth")
         {
                 mode->cr.data->genes = mode->parent_genes;
                 mode->cr.data->lifeparams = mode->parent_lifeparams;
+        }
+
+        else if (mode->opt == "birth")
+        {
+                mode->cr.data->genes = String.deserialize(String.serialize(mode->genes));
+                mode->cr.data->lifeparams = {"max_energy_level" : mode->energy0, "gen" : mode->gen,  "hibernated" : 0, "species" : mode->species, "reproduce" : 0, "dir" : randomDir(), "dir_counter" : Math.random(int(secToSimSteps(ExpProperties.dir_change_sec))), "chamber_growth" : -1, "division_time" : -1};                    
+
         }
 }
@@ -192 +186 @@
                                         if (parent1.data->lifeparams->division_time == -1 && parent2.data->lifeparams->division_time == -1)
                                         {
-                                                var time = int(ExpProperties.gametoPeriod/ExpProperties.secPerStep);
+                                                var time = int(secToSimSteps(ExpProperties.gametoPeriodSec));
                                                 parent1.data->lifeparams->division_time = time;
                                                 parent2.data->lifeparams->division_time = time;
@@ -298 +292 @@
         cr.energy0 = energy;
         cr.energy = cr.energy0;
-        setGenotype({"cr" : cr, "parent_genes" : parent_genes, "parent_lifeparams" : parent_lifeparams, "opt" : 1, "energy0" : cr.energy0});
+        setGenotype({"opt" : "birth", "cr" : cr, "gen" : 1 - parent_lifeparams->gen, "species" : parent_lifeparams->species, "energy0" : cr.energy0, "genes" : parent_genes});
         placeRandomlyNotColliding(cr);
 }