Changeset 988 for cpp/frams/genetics/geno.cpp

Timestamp:

07/09/20 00:13:20 (5 years ago)

Author:

Maciej Komosinski

Message:

Building a Model from Geno now fails when Model.shape is incompatible with Geno.format; renamed enum constants for genetic formats: xxx_FORMAT => FORMAT_xxx

File:

• cpp/frams/genetics/geno.cpp (modified) (7 diffs)

cpp/frams/genetics/geno.cpp

@@ -38 +38 @@
 }
 
-const SString Geno::INVALID_FORMAT = "invalid";
-const SString Geno::UNKNOWN_FORMAT = "";
+const SString Geno::FORMAT_INVALID = "invalid";
+const SString Geno::FORMAT_UNKNOWN = "";
 const SString Geno::F0_FORMAT_LIST = "0,0s";
 
@@ -68 +68 @@
         SString format = trim(input);
         if (format.length() == 0 || strContainsOneOf(format.c_str(), " \r\n\t"))
-                return Geno::INVALID_FORMAT;
+                return Geno::FORMAT_INVALID;
         return format;
 }
@@ -78 +78 @@
         SString gencopy(genstring);
         SString genformat = in_genformat;
-        if (genformat == UNKNOWN_FORMAT)
+        if (genformat == FORMAT_UNKNOWN)
         { // unknown format
                 genformat = "1";
@@ -118 +118 @@
                                 break;
                         }
-                        if (genformat == INVALID_FORMAT)
+                        if (genformat == FORMAT_INVALID)
                         {
                                 SString cut;
@@ -191 +191 @@
 Geno::Geno(const SString& src)
 {
-        init(src, UNKNOWN_FORMAT, SString::empty(), SString::empty());
+        init(src, FORMAT_UNKNOWN, SString::empty(), SString::empty());
 }
 
@@ -204 +204 @@
 {
         freeF0();
-        init(g, UNKNOWN_FORMAT, SString::empty(), SString::empty());
+        init(g, FORMAT_UNKNOWN, SString::empty(), SString::empty());
 }
 
@@ -277 +277 @@
         if (isvalid >= 0) return;
         if (gen.length() == 0) { isvalid = 0; return; }
-        if (format == INVALID_FORMAT) { isvalid = 0; return; }
+        if (format == FORMAT_INVALID) { isvalid = 0; return; }
         Validators* vals = getValidators();
         if (vals != NULL)