Changeset 579


Ignore:
Timestamp:
08/18/16 12:15:55 (8 years ago)
Author:
oriona
Message:

Vertical position of foraminifera lowered. Color of body and reticulopodia unified.

Location:
experiments/frams/foraminifera/data/scripts
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • experiments/frams/foraminifera/data/scripts/foraminifera.expdef

    r570 r579  
    2424
    2525global colors;
    26 global retColors;
    2726global curColor;
    2827global max_chamber_volume;
     
    9998        ExpProperties.chamber_proculus_diplo = micronsToFrams(10);
    10099        colors = ["1.0,1.0,0.0","1.0,0.5,0.0"];
    101         retColors = ["1.0,1.0,1.0", "1.0,1.0,0.0"];
    102         curColor = retColors[0];
     100        curColor = colors[0];
    103101        curRadius = ExpProperties.zone1_range;
    104102
     
    328326        var radius = getPloidRadius(ploid);
    329327        var geno = create_genotype(radius, chambernum, colors[ploid], 1);
    330         curColor = retColors[ploid];
     328        curColor = colors[ploid];
    331329        var cr = Populations[0].add(geno);
    332330        cr.name = "Initial creature" + species + "_" + iter;
     
    442440        if ((chamber_num+1) <= max_chamber_volume[cr.data->lifeparams->gen].size)
    443441        {
    444                 curColor = retColors[cr.data->lifeparams->gen];
     442                curColor = colors[cr.data->lifeparams->gen];
    445443                var ploid = cr.data->lifeparams->gen;
    446444                var geno = create_genotype(getPloidRadius(ploid), chamber_num+1, colors[ploid], lastchambergrowth);
     
    546544        }
    547545
    548         cr.moveAbs(new_x, new_y, 0);
     546        cr.moveAbs(new_x, new_y, -cr.getPart(cr.numparts-1).sx);
    549547
    550548        //are there any nutrients in zone 1 or 2?
     
    654652                                        new_rad = getZoneRange(cr,1)-new_rad;
    655653
     654                                curColor = colors[cr.data->lifeparams->gen];
    656655                                addReticulopodia(cr,new_rad);
    657656                        }
     
    10791078group:Energy
    10801079
    1081 
    10821080property:
    10831081id:crossprob
  • experiments/frams/foraminifera/data/scripts/foraminifera.inc

    r575 r579  
    274274function createOffspring(geno, energy, parent_genes, parent_lifeparams, parentsuids)
    275275{
    276         curColor = retColors[1-parent_lifeparams->gen];
     276        curColor = colors[1-parent_lifeparams->gen];
    277277        var cr = Populations[0].add(geno);
    278278        cr.energy0 = energy;
Note: See TracChangeset for help on using the changeset viewer.