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

Timestamp:

04/10/16 17:48:18 (9 years ago)

Author:

oriona

Message:

Microns to frams scaling rate changed. New world size, new log files 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"];
+        retColors = ["1.0,1.0,1.0", "1.0,0.0,0.0"];
         chambers = [ ["0.0,0.0,0.0,",  //coiled
         "1.08020961284637, -0.0597195439040661, -0.0393781512975693,",
@@ -108 +109 @@
                 new_genes = [parent.data->genes, parent2.data->genes];
                 gen = 1 - parent.data->lifeparams->gen;
+
+                if (ExpProperties.logging == 1)
+                {
+                                log(createLogVector(parent, parent.energy),ExpProperties.logPref+"repro_energies_log.txt");
+                                log(createLogVector(parent2, parent2.energy),ExpProperties.logPref+"repro_energies_log.txt");
+                                log(createLogVector(parent, number),ExpProperties.logPref+"repro_num_log.txt");
+                }       
         }
 
@@ -122 +130 @@
         var energy0 =getEnergy0( getGene(parent,"energies0", 0)[0]); 
         var number = ((1 - (getProperty(parent.data->lifeparams->gen, "e_repro_cost"))) * parent.energy) / energy0;
+
+                if (ExpProperties.logging == 1)
+                {
+                        log(createLogVector(parent, parent.energy),ExpProperties.logPref+"repro_energies_log.txt");
+                        log(createLogVector(parent, number),ExpProperties.logPref+"repro_num_log.txt");
+                }       
 
         Simulator.print("diploid number of offspring: " + number+ " energ0: " + energy0);
@@ -189 +203 @@
                                                 print_repro_info(parent1);
                                                 print_repro_info(parent2);
-                                                //Simulator.print("parents "+parent1.uid + " " + parent2.uid + " reproduced: "+Simulator.stepNumber);
                                                 pop.kill(parent1);
                                                 pop.kill(parent2);
                                                 parent1 = null;
                                                 parent2 = null;
-                                                
                                         }
                                 }       
@@ -280 +292 @@
 function createOffspring(geno, energy, parent_genes, parent_lifeparams)
 {
+        curColor = retColors[1-parent_lifeparams->gen];
         var cr = Populations[0].add(geno);
         cr.energy0 = energy;