Changeset 988 for cpp/frams/genetics/genman.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/genman.cpp (modified) (8 diffs)

cpp/frams/genetics/genman.cpp ¶

@@ -289 +289 @@
         GenoOperators *gf = getOper_f(format);
         if (gf == NULL)
-                return Geno("", Geno::INVALID_FORMAT, "", SString::sprintf("GENOPER_NOOPER: Validate(): don't know how to handle genetic format %s", format.c_str()));
+                return Geno("", Geno::FORMAT_INVALID, "", SString::sprintf("GENOPER_NOOPER: Validate(): don't know how to handle genetic format %s", format.c_str()));
         char *g2 = strdup(geny.getGenes().c_str()); //copy for validation
         int res = gf->validate(g2, geny.getName().c_str());
@@ -297 +297 @@
                 return Geno(sg2, format, geny.getName(), geny.getComment());
         else
-                return Geno("", Geno::INVALID_FORMAT, "", SString::sprintf("GENOPER_NOOPER: validate() for format %s returned invalid value", format.c_str()));
+                return Geno("", Geno::FORMAT_INVALID, "", SString::sprintf("GENOPER_NOOPER: validate() for format %s returned invalid value", format.c_str()));
 }
 
@@ -307 +307 @@
         GenoOperators *gf = getOper_f(format);
         if (gf == NULL)
-                return Geno("", Geno::INVALID_FORMAT, "", SString::sprintf("GENOPER_NOOPER: Mutate(): don't know how to handle genetic format %s", format.c_str()));
+                return Geno("", Geno::FORMAT_INVALID, "", SString::sprintf("GENOPER_NOOPER: Mutate(): don't know how to handle genetic format %s", format.c_str()));
         Geno gv = g;
         bool canvalidate = true;
         if (testValidity(gv, canvalidate) > 0 && canvalidate == false)
-                return Geno("", Geno::INVALID_FORMAT, "", "GENOPER_OPFAIL: Mutate(): cannot validate invalid source genotype");
+                return Geno("", Geno::FORMAT_INVALID, "", "GENOPER_OPFAIL: Mutate(): cannot validate invalid source genotype");
         bool ok = false;
         int pcount = count;
@@ -354 +354 @@
 {
         SString format = g1.getFormat();
-        if (format != g2.getFormat()) return Geno("", Geno::INVALID_FORMAT, "", SString::sprintf("GENOPER_NOOPER: CrossOver(): does not work for parents with differing genetic formats (%s and %s)", format.c_str(), g2.getFormat().c_str()));
+        if (format != g2.getFormat()) return Geno("", Geno::FORMAT_INVALID, "", SString::sprintf("GENOPER_NOOPER: CrossOver(): does not work for parents with differing genetic formats (%s and %s)", format.c_str(), g2.getFormat().c_str()));
         GenoOperators *gf = getOper_f(format);
         if (gf == NULL)
-                return Geno("", Geno::INVALID_FORMAT, "", SString::sprintf("GENOPER_NOOPER: CrossOver(): no operators found for genetic format %s", format.c_str()));
+                return Geno("", Geno::FORMAT_INVALID, "", SString::sprintf("GENOPER_NOOPER: CrossOver(): no operators found for genetic format %s", format.c_str()));
         Geno g1v = g1, g2v = g2;
 
@@ -364 +364 @@
                 bool canvalidate = true;
                 if (testValidity(g1v, canvalidate) > 0 && canvalidate == false)
-                        return Geno("", Geno::INVALID_FORMAT, "", "GENOPER_OPFAIL: CrossOver(): cannot validate invalid source genotype #1");
+                        return Geno("", Geno::FORMAT_INVALID, "", "GENOPER_OPFAIL: CrossOver(): cannot validate invalid source genotype #1");
                 canvalidate = true;
                 if (testValidity(g2v, canvalidate) > 0 && canvalidate == false)
-                        return Geno("", Geno::INVALID_FORMAT, "", "GENOPER_OPFAIL: CrossOver(): cannot validate invalid source genotype #2");
+                        return Geno("", Geno::FORMAT_INVALID, "", "GENOPER_OPFAIL: CrossOver(): cannot validate invalid source genotype #2");
         }
 
@@ -405 +405 @@
                 {
                         logPrintf("GenMan", "CrossOver", LOG_WARN, "Tried " GENMAN_REPEAT_FAILED_STR "x and failed: %s and %s", g1.getGenes().c_str(), g2.getGenes().c_str());
-                        return Geno("", Geno::INVALID_FORMAT, "", "GENOPER_OPFAIL: CrossOver() tried " GENMAN_REPEAT_FAILED_STR "x and failed");
+                        return Geno("", Geno::FORMAT_INVALID, "", "GENOPER_OPFAIL: CrossOver() tried " GENMAN_REPEAT_FAILED_STR "x and failed");
                 }
         }
@@ -428 +428 @@
 {
         SString format = G->getFormat();
-        if (format == Geno::INVALID_FORMAT)
+        if (format == Geno::FORMAT_INVALID)
                 return GENSTYLE_RGBS(64, 64, 64, 0); // gray & "valid" (unknown format so we don't know what is valid and what is not)
         if ((pos = G->mapStringToGen(pos)) == -1) return GENSTYLE_COMMENT;
@@ -445 +445 @@
 {
         SString format = G->getFormat();
-        if (format == Geno::INVALID_FORMAT)
+        if (format == Geno::FORMAT_INVALID)
         {
                 for (unsigned int pos = 0; pos < strlen(g); pos++)