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

cpp/frams/genetics/genoconv.cpp

@@ -107 +107 @@
         for (; gk = (GenoConverter*)converters(i); i++)
         {
-                if ((in != Geno::UNKNOWN_FORMAT) && (in != gk->in_format)) continue;
-                if ((out != Geno::UNKNOWN_FORMAT) && (out != gk->out_format)) continue;
+                if ((in != Geno::FORMAT_UNKNOWN) && (in != gk->in_format)) continue;
+                if ((out != Geno::FORMAT_UNKNOWN) && (out != gk->out_format)) continue;
                 if ((enabled != -1) && (enabled != gk->enabled)) continue;
                 if ((name) && (strcmp(name, gk->name))) continue;
@@ -168 +168 @@
         {
                 if (converter_missing) *converter_missing = false;
-                return Geno("", Geno::INVALID_FORMAT, "", "Invalid genotype cannot be converted");
+                return Geno("", Geno::FORMAT_INVALID, "", "Invalid genotype cannot be converted");
         }
         int mapavail;
@@ -176 +176 @@
         {
                 if (converter_missing) *converter_missing = true;
-                return Geno("", Geno::INVALID_FORMAT, "", "Converter not found");
+                return Geno("", Geno::FORMAT_INVALID, "", "Converter not found");
         }
         if (converter_missing) *converter_missing = false;
@@ -193 +193 @@
                 {
                         string t = ssprintf("f%s->f%s conversion failed (%s)", gk->in_format.c_str(), gk->out_format.c_str(), gk->name);
-                        return Geno("", Geno::INVALID_FORMAT, "", t.c_str());
+                        return Geno("", Geno::FORMAT_INVALID, "", t.c_str());
                 }
                 if (mapavail)