Changeset 502 for experiments/frams/foraminifera/data

Timestamp:

05/04/16 23:51:02 (9 years ago)

Author:

oriona

Message:

Reticulopdia movement and energy transfer corrected.

File:

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

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

@@ -155 +155 @@
         phase = "low";
         nutrientSqrCm = 10;
-        ExpProperties.foodperiod = 25920;
-        ExpProperties.foodPeriodChange = 6;
+        ExpProperties.foodperiod = 19200;
+        ExpProperties.foodPeriodChange = 0;
         ExpProperties.nutrientradius = micronsToFrams(10);
-        ExpProperties.energy_nut = energyFromVolume(ExpProperties.nutrientradius,1);
+        ExpProperties.energy_nut = 150 * energyFromVolume(ExpProperties.nutrientradius,1);
         ExpProperties.nutrient_pop = Math.pow(framsToMicrons(World.wrldsiz)*0.0001,2)/nutrientSqrCm;
         ExpProperties.ingestion = 0.25;
@@ -365 +365 @@
         if (ExpProperties.visualize == 1)
         {
-                var ret = Populations[2].add("//0\np:sh=3,sx=0.01,sy="+getZoneRange(cr,1)+",sz="+getZoneRange(cr,1)+",ry=1.57,vr="+curColor);
+                var ret = Populations[2].add("//0\np:sh=1,sx=0.001,sy=0.001,sz=0.001\np:sh=3,sx=0.01,sy="+getZoneRange(cr,1)+",sz="+getZoneRange(cr,1)+",ry=1.57079633,vr="+curColor+"\nj:0, 1, sh=1");
                 cr.data->reticulopodiacreature = ret;
+                ret.getMechPart(0).orient.set(o);
                 ret.moveAbs(cr.center_x-getZoneRange(cr,1), cr.center_y-getZoneRange(cr,1), cr.center_z-getZoneRange(cr,1));
         }
@@ -502 +503 @@
                 if (moved==1)
                 { 
+                        moveReticulopodia(cr);
                         return;
                 }
@@ -522 +524 @@
         {
                 cr.localDrive = cr.data->lifeparams->dir;
+        }
+        moveReticulopodia(cr);
+}
+
+function moveReticulopodia(cr)
+{
+        if (visualization(cr))
+        {
+                cr.data->reticulopodiacreature.moveAbs(cr.center_x-getZoneRange(cr,1), cr.center_y-getZoneRange(cr,1), cr.center_z-getZoneRange(cr,1));
+                cr.data->reticulopodiacreature.localDrive = cr.localDrive;
         }
 }
@@ -536 +548 @@
 {
         cr1.localDrive = XYZ.new(0,0,0);
-        var e =  ExpProperties.feedtrans*cr1.energy;//ExpProperties.feedtrans*cr1.energy*ExpProperties.ingestion*ExpProperties.secPerStep; //TODO efficiency dependent on age
-        e = Math.min(cr2.energy, e);
-        e *= ExpProperties.secPerStep;
-        //Simulator.print("transferring "+e +"("+e*ExpProperties.ingestion+")"+" to "+cr1.name +" ("+ cr1.energy+") " +" from "+cr2.name+" ("+cr2.energy+") "+ e/ExpProperties.secPerStep+ " per sec");
-        cr2.energy_m = cr2.energy_m + e + 0.0000001;
-        cr1.energy_p = cr1.energy_p + e*ExpProperties.ingestion;
+        var e =  ExpProperties.feedtrans*cr1.energy; //TODO efficiency dependent on age
+        e = Math.min(cr2.energy, e*ExpProperties.secPerStep);
+        //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_p += e*ExpProperties.ingestion;
         if (cr1.data->lifeparams->hibernated == 1)
         {
@@ -628 +639 @@
                 foramMove(cr);
 
-                if (visualization(cr))
-
-                {
-                        cr.data->reticulopodiacreature.moveAbs(cr.center_x-getZoneRange(cr,1), cr.center_y-getZoneRange(cr,1), cr.center_z-getZoneRange(cr,1));
-                }
-
                 var repro = foramReproduce(cr);
                 if (repro == 1)
@@ -683 +688 @@
 function createNutrientGenotype(nutrientradius)
 {
-        return "//0\np:sh=3,sx="+nutrientradius+",sy="+nutrientradius+",sz="+nutrientradius+",ry=1.5,vr=0.0,1.0,0.0";
+        return "//0\np:sh=3,sx="+nutrientradius+",sy="+nutrientradius+",sz="+nutrientradius+",ry=1.57,vr=0.0,1.0,0.0";
 }