Changeset 510 for experiments/frams

Timestamp:

05/19/16 23:30:23 (9 years ago)

Author:

oriona

Message:

Energy transfer changed for using tranferEnergyTo function. Dilpoid offspring number calculation changed.

Location:

experiments/frams/foraminifera/data/scripts

Files:

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

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

@@ -548 +548 @@
 {
         cr1.localDrive = XYZ.new(0,0,0);
-        var e =  ExpProperties.feedtrans*cr1.energy; //TODO efficiency dependent on age
-        e = Math.min(cr2.energy, e*ExpProperties.secPerStep);
+        var e =  ExpProperties.feedtrans*cr1.energy*ExpProperties.secPerStep; //TODO efficiency dependent on age
         //Simulator.print("transferring "+e +"("+e*ExpProperties.ingestion+")"+" to "+cr1.name +" ("+ cr1.energy+") " +" from "+cr2.uid+" ("+cr2.energy+") "+ e/ExpProperties.secPerStep+ " per sec");
-        cr2.energy -= (e + 0.0000001);
-        cr1.energy += e*ExpProperties.ingestion;
+        var transferred = cr2.transferEnergyTo(cr1, e);
+        cr1.energy -= transferred*(1-ExpProperties.ingestion);
         if (cr1.data->lifeparams->hibernated == 1)
         {

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

@@ -126 +126 @@
 function reproduce_diploid(parent)
 {
-        var energy0 =getEnergy0( getGene(parent,"energies0", 0)[0]); 
-        var number = ((1 - (getProperty(parent.data->lifeparams->gen, "e_repro_cost"))) * parent.energy) / energy0;
+        var offspring = gametsDivision(parent.energy,getEnergy0(getGene(parent,"energies0", 0)[0]));
+        var energy0 = offspring->energy; 
+        var number = offspring->number;
 
                 if (ExpProperties.logging == 1)