Changeset 667 for cpp/frams/genetics/fF/fF_genotype.cpp

Timestamp:

06/07/17 12:01:16 (6 years ago)

Author:

Maciej Komosinski

Message:

• fF foraminifera encoding supports scaling (radius) of the initial chamber (three new parameters added: radii for x,y,z)
• mutation ignores these three parameters
• float -> double for consistency everywhere

File:

• cpp/frams/genetics/fF/fF_genotype.cpp (modified) (2 diffs)

cpp/frams/genetics/fF/fF_genotype.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2017  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -8 +8 @@
 ParamEntry fF_growth_params::paramtab[] =
 {
-        { "fF", 1, 7, "fF" },
+        //on changes synchronize with fF_PROPS_TO_MUTATE from .h
+
+        { "fF", 1, 10, "fF" },
         { "n", 0, PARAM_CANOMITNAME, "number of chambers", "d 1 15 6", FIELD(number_of_chambers), },
+
+        { "rad0x", 0, PARAM_CANOMITNAME, "radius0 x", "f 0.01 2.0 1.0", FIELD(radius0x), },
+        { "rad0y", 0, PARAM_CANOMITNAME, "radius0 y", "f 0.01 2.0 1.0", FIELD(radius0y), },
+        { "rad0z", 0, PARAM_CANOMITNAME, "radius0 z", "f 0.01 2.0 1.0", FIELD(radius0z), },
+
         { "sx", 0, PARAM_CANOMITNAME, "scale x", "f 1.0 1.1 1.05", FIELD(scalex), },
         { "sy", 0, PARAM_CANOMITNAME, "scale y", "f 1.0 1.1 1.05", FIELD(scaley), },
         { "sz", 0, PARAM_CANOMITNAME, "scale z", "f 1.0 1.1 1.05", FIELD(scalez), },
+
         { "tr", 0, PARAM_CANOMITNAME, "translation factor", "f -1 1 0", FIELD(translation), },
         { "a1", 0, PARAM_CANOMITNAME, "angle 1", "f -3.1415926 3.1415926 0", FIELD(angle1), },
         { "a2", 0, PARAM_CANOMITNAME, "angle 2", "f -3.1415926 3.1415926 0", FIELD(angle2), },
+
         { 0, 0, 0, },
 };