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

Timestamp:

03/26/16 02:42:55 (9 years ago)

Author:

sz

Message:

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

File:

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

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

@@ -74 +74 @@
         var number = 1;
         var result = parent_energy;
-        while ((result-ExpParams.divisionCost) >= energy0)
-        {
-                result = (result-ExpParams.divisionCost)/2;
+        while ((result-ExpProperties.divisionCost) >= energy0)
+        {
+                result = (result-ExpProperties.divisionCost)/2;
                 number *= 2; 
         }
@@ -100 +100 @@
                 var offspring2 = gametsDivision(parent2.energy,getProperty(1,"energies0"));
                 energy0 = (offspring1->energy+offspring2->energy); 
-                number = ExpParams.gametSuccessRate*(offspring1->number+offspring2->number)/2;
+                number = ExpProperties.gametSuccessRate*(offspring1->number+offspring2->number)/2;
                 new_genes = [parent.data->genes, parent2.data->genes];
                 gen = 1 - parent.data->lifeparams->gen;
@@ -124 +124 @@
                 var crossed = 0;
                 //crossover
-                if (Math.rnd01 < ExpParams.crossprob)
+                if (Math.rnd01 < ExpProperties.crossprob)
                 {
                         crossover(parent, "min_repro_energies");
@@ -154 +154 @@
                         if (pop[i].data->lifeparams->reproduce == 1 && pop[i].data->lifeparams->species == species) 
                         { 
-                                if ((pop[i].data->lifeparams->gen==1) || ((pop[i].data->lifeparams->gen==0) && ExpParams.stress == 0))
+                                if ((pop[i].data->lifeparams->gen==1) || ((pop[i].data->lifeparams->gen==0) && ExpProperties.stress == 0))
                                 {
                                         continue;
@@ -171 +171 @@
                                         if (parent1.data->lifeparams->division_time == -1 && parent2.data->lifeparams->division_time == -1)
                                         {
-                                                var time = int(ExpParams.gametoPeriod/ExpParams.secPerStep);
+                                                var time = int(ExpProperties.gametoPeriod/ExpProperties.secPerStep);
                                                 parent1.data->lifeparams->division_time = time;
                                                 parent2.data->lifeparams->division_time = time;
@@ -206 +206 @@
         }
 
-        else if (ExpParams.stress == 0)
+        else if (ExpProperties.stress == 0)
         {
                 reproduce_haploid(cr, null, 1);
@@ -256 +256 @@
         {
                 //reproduce with probability repro_prob
-                if (Math.rnd01 <= ExpParams.repro_prob) //TODO env trigger
+                if (Math.rnd01 <= ExpProperties.repro_prob) //TODO env trigger
                 {
                         reproduced = readyToRepro(cr);