Changeset 416 for experiments

Timestamp:

07/14/15 01:00:27 (9 years ago)

Author:

Maciej Komosinski

Message:

"energ0" has been renamed to "energy0" in v4.3

Location:

experiments/frams/foraminifera/data/scripts

Files:

• foraminifera.expdef (modified) (2 diffs)
• foraminifera.inc (modified) (1 diff)

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

@@ -127 +127 @@
                 cr.name = "Initial creature" + i;
                 placeCreatureRandomly(cr, 0, 0);
-                cr.energ0 = ExpParams.v_min_h - ExpParams.repro_thr;
-                cr.energy = cr.energ0;
+                cr.energy0 = ExpParams.v_min_h - ExpParams.repro_thr;
+                cr.energy = cr.energy0;
                 cr.user1 = {"vamin" : ExpParams.v_min_h, "amin": ExpParams.age_min_h};
                 cr.user2 = {"Va" : ExpParams.v_min_h - ExpParams.repro_thr, "gen" : 0, "growth_step" : ExpParams.growth_step, "rsize" : ExpParams.rads[0], "vinit" : ExpParams.v_min_h - ExpParams.repro_thr};
@@ -366 +366 @@
         cr.name = "Food";
         cr.idleen = 0;
-        cr.energ0 = ExpParams.feede0;
-        cr.energy = cr.energ0;
+        cr.energy0 = ExpParams.feede0;
+        cr.energy = cr.energy0;
         cr.signals.add("food");
 

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

@@ -83 +83 @@
 {
         var cr = Populations[0].add(geno);
-        cr.energ0 = energy;
-        cr.energy = cr.energ0;
+        cr.energy0 = energy;
+        cr.energy = cr.energy0;
         setGenotype(cr, new_user1, new_user2);
         placeRandomlyNotColliding(cr);