Changeset 732 for cpp/frams/genetics/geno.cpp

Timestamp:

02/15/18 00:42:07 (6 years ago)

Author:

Maciej Komosinski

Message:

Added support for "checkpoints" (intermediate phases of development of the Model when converting between genetic encodings). See Model.checkpoint() and conv_f1.cpp for an example.

File:

• cpp/frams/genetics/geno.cpp (modified) (9 diffs)

cpp/frams/genetics/geno.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -32 +32 @@
         name = genname;
         txt = comment;
-        setGenesAndFormat(genstring,genformat);
+        setGenesAndFormat(genstring, genformat);
 }
 
@@ -54 +54 @@
                                         mapinshift = end + 1;
                                         gencopy = genstring.substr(end + 1);
-                                        if ((end>0) && (genstring[end-1]=='\r')) end--;
+                                        if ((end > 0) && (genstring[end - 1] == '\r')) end--;
                                         error_end = end;
                                         if (end != 3) genformat = INVALID_FORMAT;
@@ -82 +82 @@
                                 break;
                         }
-                        if (!isalnum(genformat)) genformat=INVALID_FORMAT;
+                        if (!isalnum(genformat)) genformat = INVALID_FORMAT;
                         if (genformat == INVALID_FORMAT)
                         {
@@ -93 +93 @@
                                         cut = genstring.substr(0, error_end);
                                 int lf = cut.indexOf('\n');
-                                if (lf >= 0) { if ((lf>0)&&(cut[lf-1]=='\r')) lf--; cut = cut.substr(0, lf); }
+                                if (lf >= 0) { if ((lf > 0) && (cut[lf - 1] == '\r')) lf--; cut = cut.substr(0, lf); }
                                 sstringQuote(cut);
                                 logPrintf("Geno", "init", LOG_ERROR, "Invalid genotype format declaration: '%s'%s", cut.c_str(), name.len() ? SString::sprintf(" in '%s'", name.c_str()).c_str() : "");
@@ -226 +226 @@
         {
                 bool converter_missing;
-                Geno f0geno = g.getConverted('0', NULL, &converter_missing);
+                Geno f0geno = g.getConverted('0', NULL, false, &converter_missing);
                 if (converter_missing)
                         return -1;//no result
@@ -295 +295 @@
 }
 
-Geno Geno::getConverted(char otherformat, MultiMap *m, bool *converter_missing)
+Geno Geno::getConverted(char otherformat, MultiMap *m, bool using_checkpoints, bool *converter_missing)
 {
         if (otherformat == getFormat()) { if (converter_missing) *converter_missing = false; return *this; }
@@ -302 +302 @@
         if (converters)
         {
-                if ((otherformat == '0') && (!m))
+                if ((otherformat == '0') && (!m) && (!using_checkpoints))
                 {
                         if (!f0gen)
-                                f0gen = new Geno(converters->convert(*this, otherformat, NULL, converter_missing));
+                                f0gen = new Geno(converters->convert(*this, otherformat, NULL, using_checkpoints, converter_missing));
                         else
                         {
@@ -313 +313 @@
                 }
                 else
-                        return converters->convert(*this, otherformat, m, converter_missing);
+                        return converters->convert(*this, otherformat, m, using_checkpoints, converter_missing);
         }
 #endif