Changeset 1231 for cpp/frams/genetics/f4/f4_conv.cpp

Timestamp:

05/02/23 01:36:15 (13 months ago)

Author:

Maciej Komosinski

Message:

• Thanks to r1230, it is possible to detect (and repair=remove) junk trailing genes that are left after successful parsing (after last '>')
• The validate() function may attempt to repair a genotype where earlier it would give up
• Stricter parsing of the '#' gene

File:

• cpp/frams/genetics/f4/f4_conv.cpp (modified) (7 diffs)

cpp/frams/genetics/f4/f4_conv.cpp

@@ -27 +27 @@
 SString GenoConv_f40::convert(SString &in, MultiMap *map, bool using_checkpoints)
 {
-        int res;
         f4_Model *model = new f4_Model();
-        res = model->buildFromF4(in, using_checkpoints);
-        if (GENOPER_OK != res)
+        int res = model->buildFromF4(in, using_checkpoints);
+        if (res != GENOPER_OK)
         {
                 delete model;
@@ -55 +54 @@
 SString GenoConv_F41_TestOnly::convert(SString &in, MultiMap *map, bool using_checkpoints)
 {
-        int res;
         f4_Model *model = new f4_Model();
-        res = model->buildFromF4(in, using_checkpoints);
-        if (GENOPER_OK != res)
+        int res = model->buildFromF4(in, using_checkpoints);
+        if (res != GENOPER_OK)
         {
                 delete model;
@@ -82 +80 @@
 int f4_Model::buildFromF4(SString &geno, bool using_checkpoints)
 {
-        int i;
-
         error = GENOPER_OK;
         errorpos = -1;
 
+        // transform geno from string to nodes
+        f4_Node f4rootnode;
+        int res = f4_process(geno.c_str(), &f4rootnode);
+        if (res || (f4rootnode.childCount() != 1)) //consider any error fatal, preventing building a model
+        {
+                error = GENOPER_OPFAIL;
+                errorpos = res;
+                return error;
+        }
+
         // build cells, and simulate
         if (cells) delete cells;
-        cells = new f4_Cells(geno, 0);
-        if (GENOPER_OK != cells->getErrorCode())
+        cells = new f4_Cells(f4rootnode.child, false);
+        if (cells->getErrorCode() != GENOPER_OK)
         {
                 error = cells->getErrorCode();
@@ -99 +105 @@
 
         cells->simulate();
-        if (GENOPER_OK != cells->getErrorCode())
+        if (cells->getErrorCode() != GENOPER_OK)
         {
                 error = cells->getErrorCode();
@@ -107 +113 @@
 
         // reset recursive traverse flags
-        for (i = 0; i < cells->cell_count; i++)
+        for (int i = 0; i < cells->cell_count; i++)
                 cells->C[i]->recProcessedFlag = 0;
 
@@ -113 +119 @@
 
         // process every cell
-        int res;
-        for (i = 0; i < cells->cell_count; i++)
-        {
-                res = buildModelRec(cells->C[i]);
+        for (int i = 0; i < cells->cell_count; i++)
+        {
+                int res = buildModelRec(cells->C[i]);
                 if (res)
                 {
-                        logMessage("f4_Model", "buildFromF4", LOG_ERROR, "Error in building a Model");
+                        logPrintf("f4_Model", "buildFromF4", LOG_ERROR, "Error %d when building a Model", res);
                         error = res;
                         break;
@@ -125 +130 @@
         }
 
-        res = close();
-        if (0 == res) // invalid
+        int res_close = close();
+        if (res_close == 0) // invalid
+        {
+                logPrintf("f4_Model", "buildFromF4", LOG_ERROR, "Error %d when closing a Model", res_close);
                 error = -10;
+        }
 
         return error;