Changeset 1232 for cpp/frams/genetics/f4/f4_general.cpp

Timestamp:

05/02/23 17:12:24 (2 years ago)

Author:

Maciej Komosinski

Message:

The validate() function may now attempt to repair genotypes without syntax errors (i.e., fully parsed into a correct f4_Node tree), but with semantic errors

File:

• cpp/frams/genetics/f4/f4_general.cpp (modified) (2 diffs)

cpp/frams/genetics/f4/f4_general.cpp ¶

@@ -795 +795 @@
 }
 
-void f4_Cells::setRepairRemove(int nerrpos, f4_Node *rem)
-{
+void f4_Cells::setRepairRemove(int nerrpos, f4_Node *to_remove)
+{
+        errorcode = GENOPER_REPAIR;
+        errorpos = nerrpos;
         if (!repair)
         {
                 // not in repair mode, treat as repairable error
-                errorcode = GENOPER_REPAIR;
-                errorpos = nerrpos;
         }
         else
         {
-                errorcode = GENOPER_REPAIR;
-                errorpos = nerrpos;
-                repair_remove = rem;
-        }
-}
-
-int f4_Cells::setRepairInsert(int nerrpos, f4_Node *parent, f4_Node *insert)
-{
+                repair_remove = to_remove;
+        }
+}
+
+int f4_Cells::setRepairInsert(int nerrpos, f4_Node *parent, f4_Node *to_insert)
+{
+        errorcode = GENOPER_REPAIR;
+        errorpos = nerrpos;
         if (!repair)
         {
                 // not in repair mode, treat as repairable error
-                errorcode = GENOPER_REPAIR;
-                errorpos = nerrpos;
                 return -1;
         }
         else
         {
-                errorcode = GENOPER_REPAIR;
-                errorpos = nerrpos;
                 repair_parent = parent;
-                repair_insert = insert;
+                repair_insert = to_insert;
                 return 0;
         }
@@ -1423 +1419 @@
         int res = f4_processRecur(genot, pos, root);
         if (res > 0)
-                return res; //error
-        else if (genot[pos] == 0) //parsed until the end - OK!
-                return 0;
-        else return pos + 1; //junk, unparsed genes after successful parsing, for example /*4*/<X>N:N>whatever or /*4*/<X>X>>>
+                return res; //parsing error
+        else if (genot[pos] != 0)
+                return pos + 1; //parsing OK but junk, unparsed genes left, for example /*4*/<X>N:N>whatever or /*4*/<X>X>>>
+        else
+                return 0; //parsing OK and parsed until the end
 }