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

Timestamp:

03/29/18 22:52:36 (7 years ago)

Author:

Maciej Komosinski

Message:

More strict parsing of the repetition counter; bug fixes; improved docs [refs #62]

File:

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

cpp/frams/genetics/f4/f4_general.cpp

@@ -466 +466 @@
                                 float w = gcur->f1;
                                 f4_Cell *tneu = NULL;
-                                if (t > 0) // sensors
+                                if (t < 0) // wrong sensor
+                                {
+                                        string buf = "wrong sensor in link '";
+                                        buf.append(gcur->s1);
+                                        buf.append("'");
+                                        logMessage("f4_Cell", "onestep", LOG_ERROR, buf.c_str());
+                                        org->setRepairRemove(gcur->pos, gcur);
+                                        return 1;
+                                }
+                                else if (t > 0) // sensors
                                 {
                                         char *temp = (char*)gcur->s1.c_str();
@@ -476 +485 @@
                                                 buf.append(gcur->s1);
                                                 buf.append("'");
-                                                logMessage("f4_Cell", "onestep", LOG_WARN, buf.c_str()); //TODO ask
+                                                logMessage("f4_Cell", "onestep", LOG_ERROR, buf.c_str());
                                                 org->setRepairRemove(gcur->pos, gcur);
                                                 return 1;
@@ -1227 +1236 @@
 void f4_node::sprint(SString& out)
 {
-        string buf2 = "";
+        char buf2[20];
         // special case: repetition code
         if (name == "#")
@@ -1234 +1243 @@
                 if (i1 != 1)
                 {
-                        sprintf((char*)buf2.c_str(), "%d", i1);
-                        out += buf2.c_str();
+                        sprintf(buf2, "%d", i1);
+                        out += buf2;
                 }
         }
@@ -1250 +1259 @@
                         else
                         {
-                                sprintf((char*)buf2.c_str(), "%ld", l1);
-                                out += buf2.c_str();
-                        }
-                        sprintf((char*)buf2.c_str(), ":%g]", f1);
-                        out += buf2.c_str();
+                                sprintf(buf2, "%ld", l1);
+                                out += buf2;
+                        }
+                        sprintf(buf2, ":%g]", f1);
+                        out += buf2;
                 }
                 else if (name == ":")
                 {
-                        sprintf((char*)buf2.c_str(), ":%c%c:", l1 ? '+' : '-', (char)i1);
-                        out += buf2.c_str();
+                        sprintf(buf2, ":%c%c:", l1 ? '+' : '-', (char)i1);
+                        out += buf2;
                 }
                 else if (name == "@" || name == "|")
@@ -1265 +1274 @@
                         if (parent->name == "N")
                         {
-                                buf2 = name;
-                                out += buf2.c_str();
+                                out += name.c_str();
                         }
                         else
                         {
                                 out += "N:";
-                                buf2 = name;
-                                out += buf2.c_str();
+                                out += name.c_str();
                         }
                 }
@@ -1283 +1290 @@
                                 out += "N:";
                         }
-                        buf2 = name;
-                        out += buf2.c_str();
+                        out += name.c_str();
                 }
         }
@@ -1402 +1408 @@
                 {
                         // repetition marker, 1 by default
-                        if (sscanf(genot + gpos, "#%d", &i) != 1) i = 1;
+                        ExtValue val;
+                        const char * end = val.parseNumber(genot + gpos + 1, ExtPType::TInt);
+                        if (end == NULL) i = 1;
+                        else i = val.getInt();
                         // find out genotype start for continuation
                         j = scanrec(genot + gpos + 1, strlen(genot + gpos + 1), '>');
                         // skip number
                         oldpos = gpos;
-                        gpos++;
-                        while ((genot[gpos] >= '0') && (genot[gpos] <= '9')) gpos++;
+                        gpos += end - (genot + gpos);
+                        //gpos++;
+                        //while ((genot[gpos] >= '0') && (genot[gpos] <= '9')) gpos++;node1 = new f4_node("#", par, oldpos);
                         node1 = new f4_node("#", par, oldpos);
                         node1->i1 = i;
@@ -1527 +1537 @@
                                 end = parseConnectionWithNeuron(genot + gpos, neutype, w);
                                 if (end == NULL) t = -1;
-                                t = 1;
+                                else t = 1;
                         }
                         else