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

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.h (modified) (3 diffs)

cpp/frams/genetics/fF/fF_genotype.h

@@ -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.
 
@@ -14 +14 @@
 {
         int number_of_chambers;
-        double scalex, scaley, scalez;
+        double radius0x, radius0y, radius0z; //radius of 0th (initial) chamber
+        double scalex, scaley, scalez; //(cumulative) scaling of consecutive chambers
         double translation;
         double angle1, angle2;
+#define fF_PROPS_TO_MUTATE {0,4,5,6,7,8,9} //indexes of properties from paramtab; keep synchronized with fF_genotype.cpp
 
         static ParamEntry paramtab[];
         Param param;
 
-        fF_growth_params()
-                :param(paramtab, this)
+        fF_growth_params() :param(paramtab, this)
         {
                 reset();
@@ -36 +37 @@
                 SString s = serialized;
                 int p = 0; //position in string
-                return ((param.load2(s, p) == 7) && (p == s.len()));
+                return ((param.load2(s, p) == param.getPropCount()) && (p == s.len()));
         }