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

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.inc (modified) (5 diffs)

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

@@ -5 +5 @@
 {
         colors = ["1.0,1.0,0.0","1.0,0.5,0.0"];
-        chambers = [ ["0.0,0.0,0.0,", //longitudal
-        "0.98089325428009, 0.00591040402650833, 0.00389722990803421,",
-        "1.90962779521942, -0.256769120693207, -0.16194811463356,",
-        "2.63965249061584, -0.727959632873535, -0.609036147594452,",
-        "3.17575979232788, -1.34843015670776, -1.14828503131866,",
-        "3.55273032188416, -2.22369408607483, -1.3917418718338,",
-        "3.64916682243347, -3.11888360977173, -1.01666414737701,",
-        "3.50461649894714, -3.84039807319641, -0.377427101135254,",
-        "3.15921688079834, -4.50001525878906, 0.261153399944305,",
-        "2.51528453826904, -5.16421365737915, 0.59241509437561,"],
-        ["0.0,0.0,0.0,",  //coiled
+        chambers = [ ["0.0,0.0,0.0,",  //coiled
         "1.08020961284637, -0.0597195439040661, -0.0393781512975693,",
         "1.08020961284637, -0.0597195439040661, -0.0393781512975693,",
@@ -25 +15 @@
         "1.0958571434021, 0.316927701234818, -1.813929438591,",
         "0.903768002986908, 1.11856341362, -2.53161096572876,",
-        "0.21014116704464, 0.295340299606323, -2.45328187942505,"] ];
+        "0.21014116704464, 0.295340299606323, -2.45328187942505,"],
+        ["0.0,0.0,0.0,", //longitudal
+        "0.98089325428009, 0.00591040402650833, 0.00389722990803421,",
+        "1.90962779521942, -0.256769120693207, -0.16194811463356,",
+        "2.63965249061584, -0.727959632873535, -0.609036147594452,",
+        "3.17575979232788, -1.34843015670776, -1.14828503131866,",
+        "3.55273032188416, -2.22369408607483, -1.3917418718338,",
+        "3.64916682243347, -3.11888360977173, -1.01666414737701,",
+        "3.50461649894714, -3.84039807319641, -0.377427101135254,",
+        "3.15921688079834, -4.50001525878906, 0.261153399944305,",
+        "2.51528453826904, -5.16421365737915, 0.59241509437561,"]];
 }
 
@@ -37 +37 @@
         for (var i = 0; i < chamber_num; i++)
         {
-                rad = getProperty(gen, "chamber_proculus") + getProperty(gen, "chamber_difference") * (i + 1); 
+                rad = getProperty(gen, "chamber_proculus") + getProperty(gen, "chamber_difference") * (i + 1);
                 geno += "\n" + "p:" + chambers[species][i+1] + "sh=1,sx=" + rad + ",sy=" + rad + ",sz=" + rad + ",vr=" + colors[gen];
         }
@@ -46 +46 @@
         }
 
-        if (species == 1) geno += "\nn:p=0,d=\"S\"";
+        if (species == 0) geno += "\nn:p=0,d=\"S\"";
 
         return geno;
@@ -55 +55 @@
         if (mode["opt"] == 0) //initial
         {
-                mode["cr"].user1 = {"min_repro_energies" : [max_chamber_energ[0][getProperty(0, "min_repro_energ")], max_chamber_energ[1][getProperty(1, "min_repro_energ")]], "hibernation" : 1 - mode["species"]};
+                mode["cr"].user1 = {"min_repro_energies" : [max_chamber_energ[0][getProperty(0, "min_repro_energ")], max_chamber_energ[1][getProperty(1, "min_repro_energ")]], "hibernation" : mode["species"]};
                 mode["cr"].user2 = {"max_energy_level" : getProperty(0,"energies0"), "gen" : 0,  "hibernated" : 0, "species" : mode["species"], "reproduce" : 0};
         }