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

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/geno.h (modified) (3 diffs)

cpp/frams/genetics/geno.h ¶

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2016  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -90 +90 @@
 
         /** @param genformat=-1 -> detect genotype format from genstring comment (like the constructor does), else specify the valid format in genformat and pure genes in genstring. */
-        void setGenesAndFormat(const SString& genstring, char genformat=-1);
+        void setGenesAndFormat(const SString& genstring, char genformat = -1);
         /** g must be pure genes, without format. For the standard behavior use setGenesAndFormat() */
         void setGenesAssumingSameFormat(const SString& g);
@@ -107 +107 @@
         /// make converted version of the genotype.
         /// @param converter_missing optional output parameter (ignored when NULL). Receives true if the conversion fails because of the lack of appropriate converter(s) (the returned Geno is always invalid in this case). Receives false if the genotype was converted by a converter or a converter chain (the returned Geno can be valid or invalid, depending on the converter's decision).
-        Geno getConverted(char otherformat, MultiMap *m = 0, bool *converter_missing = NULL);
+        Geno getConverted(char otherformat, MultiMap *m = 0, bool using_checkpoints = false, bool *converter_missing = NULL);
 
         /// @return -1 = before first char in the string