Changeset 513 for cpp/frams/genetics/genman.cpp

Timestamp:

05/23/16 13:52:53 (8 years ago)

Author:

Maciej Komosinski

Message:

checkValidity() and validate() are now aware of genotype name

File:

• cpp/frams/genetics/genman.cpp (modified) (3 diffs)

cpp/frams/genetics/genman.cpp

@@ -203 +203 @@
         int check1;
         if (!gf) { canvalidate = false; return GENOPER_NOOPER; }
-        else check1 = gf->checkValidity(gg);
+        else check1 = gf->checkValidity(gg,g.getName().c_str());
         if (!canvalidate) return check1; //just checking
         if (check1 == GENOPER_OK) { canvalidate = false; return check1; }
         char *g2 = strdup(gg);
-        if (gf->validate(g2) == GENOPER_NOOPER) { free(g2); canvalidate = false; return check1; }
+        if (gf->validate(g2,g.getName().c_str()) == GENOPER_NOOPER) { free(g2); canvalidate = false; return check1; }
         if (check1 == GENOPER_NOOPER) //disaster: cannot check because there is no check operator
         {
                 g.setGene(g2); free(g2); canvalidate = false; return GENOPER_NOOPER;
         }
-        int check2 = gf->checkValidity(g2);
+        int check2 = gf->checkValidity(g2, "validated");
         if (check2 == GENOPER_OK) g.setGene(g2);
         free(g2);
@@ -238 +238 @@
                 return Geno(SString::empty(), -1, SString::empty(), SString::sprintf("GENOPER_NOOPER: Validate(): don't know how to handle genetic format %c", format));
         char *g2 = strdup(geny.getGene().c_str()); //copy for validation
-        int res = gf->validate(g2);
+        int res = gf->validate(g2, geny.getName().c_str());
         SString sg2 = g2;
         free(g2);
@@ -537 +537 @@
         {
                 string l;
-                if (oper_fx_list[i]->checkValidity("") != GENOPER_NOOPER) l += " checkValidity";
+                if (oper_fx_list[i]->checkValidity("","") != GENOPER_NOOPER) l += " checkValidity";
                 if (oper_fx_list[i]->getSimplest())
                 {
                         g = strdup(oper_fx_list[i]->getSimplest());
                         g2 = strdup(g);
-                        if (oper_fx_list[i]->validate(g) != GENOPER_NOOPER) l += " validate";
+                        if (oper_fx_list[i]->validate(g,"") != GENOPER_NOOPER) l += " validate";
                         if (oper_fx_list[i]->mutate(g, f1, m) != GENOPER_NOOPER) l += " mutate";
                         if (oper_fx_list[i]->crossOver(g, g2, f1, f2) != GENOPER_NOOPER) l += " crossover";