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

Timestamp:

02/15/18 00:42:07 (7 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/genoconv.cpp (modified) (4 diffs)

cpp/frams/genetics/genoconv.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.
 
@@ -81 +81 @@
 
 GenoConvManager::GenoConvManager()
-:param(this)
+        :param(this)
 {
 }
@@ -166 +166 @@
 }
 
-Geno GenoConvManager::convert(Geno &in, char format, MultiMap *map, bool *converter_missing)
+Geno GenoConvManager::convert(Geno &in, char format, MultiMap *map, bool using_checkpoints, bool *converter_missing)
 {
         if (in.getFormat() == format) { if (converter_missing) *converter_missing = false; return in; }
@@ -187 +187 @@
         {
                 GenoConverter *gk = (GenoConverter*)converters(*t);
-                tmp = gk->convert(tmp, mapavail ? &tmpmap : 0);
+                tmp = gk->convert(tmp, mapavail ? &tmpmap : 0, using_checkpoints);
                 if (!tmp.len())
                 {
-                        string t=ssprintf("f%c->f%c conversion failed (%s)", gk->in_format, gk->out_format, gk->name);
+                        string t = ssprintf("f%c->f%c conversion failed (%s)", gk->in_format, gk->out_format, gk->name);
                         return Geno(0, 0, 0, t.c_str());
                 }