Changeset 595

Timestamp:

08/23/16 21:28:36 (8 years ago)

Author:

oriona

Message:

Rotation of creatures in z axis changed to random. LocalDrive? usage replaced by drive.

Location:

experiments/frams/foraminifera/data/scripts

Files:

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

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

@@ -323 +323 @@
 }
 
+function createAndRotate(geno, rotate_min, rotate_max, pop_num)
+{
+        var cr = Populations[pop_num].add(geno);
+        cr.rotate(0,0,Math.rndUni(rotate_min, rotate_max));
+        return cr;      
+}
+
+//TODO unifiy addForam, foramGrow and createOffspring
 function addForam(species, iter, start_energy, ploid)
 {
@@ -329 +337 @@
         var geno = create_genotype(radius, chambernum, colors[ploid], 1);
         curColor = colors[ploid];
-        var cr = Populations[0].add(geno);
+        var cr = createAndRotate(geno, 0, 2*Math.pi, 0);
         cr.name = "Initial creature" + species + "_" + iter;
         placeRandomlyNotColliding(cr);
@@ -448 +456 @@
                 var ploid = cr.data->lifeparams->gen;
                 var geno = create_genotype(getPloidRadius(ploid), chamber_num+1, colors[ploid], lastchambergrowth);
-                var cr2 = Populations[0].add(geno);
-
+                var cr2 = createAndRotate(geno, 0, 0, 0);
+
+                cr2.orient.set(cr.orient);
                 cr2.energy0 = cr.energy;
                 cr2.energy = cr2.energy0;
@@ -507 +516 @@
 function stepToNearest(cr)
 {
-        var p = cr.getMechPart(0);
+        var p = XYZ.new(cr.center_x, cr.center_y, cr.center_z);
         var n = cr.signals.receiveSet("nutrient", getZoneRange(cr,2));
 
@@ -523 +532 @@
                 for (i = 0; i < n.size; i++)
                 {
-                        mp = n[i].value.getMechPart(0);
-                        distvec.set(mp.pos);
-                        distvec.sub(p.pos);
+                        mp = XYZ.new(n[i].value.center_x, n[i].value.center_y, n[i].value.center_z);
+                        distvec.set(mp);
+                        distvec.sub(p);
                         dist = distvec.length;
                         if (dist < getZoneRange(cr,1))
@@ -546 +555 @@
                         mindistvec.z = 0;
                         mindistvec.normalize();
-                        mindistvec.scale(-1*movePerStep);
-                        cr.localDrive = mindistvec;
+                        mindistvec.scale(movePerStep);
+                        cr.drive = mindistvec;
                         moveEnergyDec(cr);
                 }
@@ -601 +610 @@
         {
                 reverseHib(cr);
-                cr.localDrive = XYZ.new(0,0,0);
+                cr.drive = XYZ.new(0,0,0);
         }
         //random move
@@ -608 +617 @@
                 cr.data->lifeparams->dir = randomDir();
                 cr.data->lifeparams->dir_counter = 0;
-                cr.localDrive = cr.data->lifeparams->dir;
+                cr.drive = cr.data->lifeparams->dir;
                 moveEnergyDec(cr);
         }
         else
         {
-                cr.localDrive = cr.data->lifeparams->dir;
+                cr.drive = cr.data->lifeparams->dir;
         }
         moveReticulopodia(cr);
@@ -623 +632 @@
         {
                 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;
+                cr.data->reticulopodiacreature.drive = cr.drive;
         }
 }
@@ -637 +646 @@
 function energyTransfer(cr1, cr2)
 {
-        cr1.localDrive = XYZ.new(0,0,0);
+        cr1.drive = XYZ.new(0,0,0);
         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");

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

@@ -275 +275 @@
 {
         curColor = colors[1-parent_lifeparams->gen];
-        var cr = Populations[0].add(geno);
+        var cr = createAndRotate(geno, 0, 2*Math.pi, 0);
         cr.energy0 = energy;
         cr.energy = cr.energy0;