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

Timestamp:

02/26/14 20:21:22 (9 years ago)

Author:

sz

Message:

Genetics reorganization (affects ALL applications!):

• Converters/Validators? are now configured/initialized in a more verbose but also less confusing way
• At the same time, the PreconfiguredGenetics? object will help you avoid the increased complexity by creating the ready-to-use environment that is sufficient in 99% of cases (see the demos)
• Format F genetics updated (work in progress)

File:

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

cpp/frams/genetics/fF/fF_genotype.h

@@ -8 +8 @@
 #include <stdio.h>
 #include "common/stl-util.h"
-
+#include <frams/param/param.h>
 
 struct fF_growth_params
 {
         int number_of_chambers;
-        double scalex, scaley, scalez; //scaling factors
-        double translation; //translation factor, TF range [−1; 1]
+        double scalex, scaley, scalez;
+        double translation;
         double angle1, angle2;
 
+        static ParamEntry paramtab[];
+        Param param;
+
         fF_growth_params()
+                :param(paramtab, this)
         {
                 reset();
@@ -24 +28 @@
         void reset()
         {
-                number_of_chambers = 1;
-                scalex = scaley = scalez = 1;
-                translation = 1;
-                angle1 = angle2 = 0;
+                param.setDefault();
         }
 
         bool load(const char* serialized)
         {
-                return sscanf(serialized, "%d %lf %lf %lf %lf %lf %lf", &number_of_chambers, &scalex, &scaley, &scalez, &translation, &angle1, &angle2) == 7;
+                SString s = serialized;
+                int p = 0; //position in string
+                return ((param.load2(s, p)==7) && (p==s.len()));
         }
 
         string save()
         {
-                return ssprintf("%d %f %f %f %f %f %f", number_of_chambers, scalex, scaley, scalez, translation, angle1, angle2);
+                SString tmp;
+                param.save2(tmp, NULL/*object containing default values for comparison*/, false/*add CR*/, false/*force field names*/);
+                return string((const char*)tmp);
         }
 };