Changeset 405


Ignore:
Timestamp:
07/01/15 02:20:26 (9 years ago)
Author:
Maciej Komosinski
Message:

Fixed typos, prop:name extra space, and formatting

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

Legend:

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

    r404 r405  
    7070
    7171        //radius of the chamber
    72         ExpParams.rads = [1.2, 0.6];
    73         //inital genotypes 
    74         ExpParams.genh = "//0\np:sh=1,sx=" + ExpParams.rads[0] + ",sy=" + ExpParams.rads[0] + ",sz=" + ExpParams.rads[0] + ", rz=3.14159265358979"; 
     72        ExpParams.rads = [1.2, 0.6];
     73        //inital genotypes
     74        ExpParams.genh = "//0\np:sh=1,sx=" + ExpParams.rads[0] + ",sy=" + ExpParams.rads[0] + ",sz=" + ExpParams.rads[0] + ", rz=3.14159265358979";
    7575        ExpParams.gend = "//0\np:sh=1,sx=" + ExpParams.rads[1] + ",sy=" + ExpParams.rads[1] + ",sz=" + ExpParams.rads[1] + ", rz=3.14159265358979";
    76         ExpParams.gend += "\nn:p=0,d=\"S\"";
     76        ExpParams.gend += "\nn:p=0,d=\"S\"";
    7777        ExpParams.e_meta = 0.1;
    7878        ExpParams.feedrate = 0.5;
     
    227227function onCreaturesStep(cr)
    228228{
    229         //TODO moving inside sediment?
    230         cr.moveAbs(cr.pos_x, cr.pos_y, 0); //adjustment in z axis 
     229        //TODO moving inside sediment?
     230        cr.moveAbs(cr.pos_x, cr.pos_y, 0); //adjustment in z axis
    231231        var p = cr.getMechPart(0);
    232232        var n = cr.signals.receiveSet("food", ExpParams.food_range);
     
    269269        if (cr.energy > 100)
    270270        {
    271                 //TODO energy costs dependant on size
     271                //TODO energy costs dependent on size
    272272                // cr.energy_m = cr.user2["Va"]/cr.user2["vinit"];
    273273        }
     
    277277                //TODO what is max age value? should there be one?
    278278                Populations[0].kill(cr);
    279                 return;
     279                return;
    280280        }
    281281
     
    283283        if (cr.lifespan == cr.user2["growth_step"])
    284284        {
    285                 //TODO how size is related to the energy?
    286                 cr.user2["rsize"] = ExpParams.rads[cr.user2["gen"]] * Math.min(Math.max(float(cr.user2["Va"] / cr.user2["vinit"]) * 0.5, 1.0), 2.5);
     285                //TODO how size is related to the energy?
     286                cr.user2["rsize"] = ExpParams.rads[cr.user2["gen"]] * Math.min(Math.max(float(cr.user2["Va"] / cr.user2["vinit"]) * 0.5, 1.0), 2.5);
    287287                var geno = "//0\np:sh=1,sx=" + cr.user2["rsize"] + ",sy=" + cr.user2["rsize"] + ",sz=" + cr.user2["rsize"] + ", rz=3.14159265358979";
    288288                if (cr.user2["gen"] == 1)
     
    291291                        //TODO maybe it would be nice if they rotated so the "S" would show where they are going (direction/intention)
    292292                }
    293                 var cr2 = Populations[0].add(geno);
     293                var cr2 = Populations[0].add(geno);
    294294                cr2.energy = cr.energy;
    295295                setGenotype(cr2, cr.user1, cr.user2);
     
    347347        {
    348348                cr.user1 = [ {"vamin" : new_user1[0]["vamin"], "amin": new_user1[0]["amin"] }, {"vamin" : new_user1[1]["vamin"], "amin": new_user1[1]["amin"] }];
    349         }       
     349        }
    350350
    351351}
     
    426426prop:
    427427id:rads
    428 name: haploid and diploid radius
     428name:Haploid and diploid radius
    429429type:x
    430430
     
    455455prop:
    456456id:repro_thr
    457 name:amount of energy initial creatures need to gather to reproduce
     457name:Energy creatures need to gather to reproduce
    458458type:d 1 1000 1
    459459
     
    583583prop:
    584584id:foodPop
    585 name:food size
     585name:Food size
    586586type:d 1 1000 10
    587587
     
    592592type:x
    593593flags:32
    594 
  • experiments/frams/foraminifera/data/scripts/forams_repro.inc

    r404 r405  
    108108                        haploids += 1;
    109109                        e_inc_h += cr.energy;
    110                         size_h += ExpParams.rads[0]; //TODO change of size dependant on gene
     110                        size_h += ExpParams.rads[0]; //TODO change of size dependent on gene
    111111                        vmin_h += cr.user1["vamin"];
    112112                }
     
    115115                        diploids += 1;
    116116                        e_inc_d += cr.energy;
    117                         size_d += ExpParams.rads[1]; //TODO change of size dependant on gene
     117                        size_d += ExpParams.rads[1]; //TODO change of size dependent on gene
    118118                        vmin_d += cr.user1[0]["vamin"];
    119119                }
Note: See TracChangeset for help on using the changeset viewer.