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

Timestamp:

06/25/20 00:34:29 (4 years ago)

Author:

Maciej Komosinski

Message:

Genetic format ID becomes a string (no longer limited to a single character)

File:

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

cpp/frams/genetics/geno.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -34 +34 @@
         SString gen;
         SString name;
-        char format;
+        SString format;
         SString txt;
         int isvalid; ///< <0 -> unknown   >=0 -> value for "isValid"
@@ -44 +44 @@
         int multiline;
 
-        void init(const SString& genstring, char genformat, const SString& genname, const SString& comment);
+        void init(const SString& genstring, const SString& genformat, const SString& genname, const SString& comment);
         void validate(void);
 
@@ -55 +55 @@
 
 public:
-        static const char INVALID_FORMAT = '!';
+        static const SString INVALID_FORMAT;
+        static const SString UNKNOWN_FORMAT;
         typedef SListTempl<GenoValidator*> Validators;
 
@@ -62 +63 @@
         /// @param genformat genotype format
         /// @param comment information about genotype (for genetic operators and "history")
-        Geno(const char *genstring = 0, char genformat = -1, const char *genname = 0, const char *comment = 0);
+        Geno(const char *genstring = 0, const char* genformat = 0, const char *genname = 0, const char *comment = 0);
+
+        Geno(const char *genstring, char genformat, const char *genname = 0, const char *comment = 0); //old style Geno, accepts char genoformat
 
         /// create a genotype object from primitives
@@ -69 +72 @@
         /// @param name genotype name, new name will generated if needed
         /// @param comment information about genotype (for genetic operators and "history")
-        Geno(const SString& genstring, char genformat, const SString& genname, const SString& comment);
+        Geno(const SString& genstring, const SString& genformat, const SString& genname, const SString& comment);
 
         /// create object from full string, containing optional format and comment information
@@ -89 +92 @@
         void setString(const SString& genewithcomments);
 
-        /** @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);
+        /** @param genformat="" -> 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, const SString& genformat = UNKNOWN_FORMAT);
         /** g must be pure genes, without format. For the standard behavior use setGenesAndFormat() */
         void setGenesAssumingSameFormat(const SString& g);
@@ -97 +100 @@
         SString getName(void) const;
         void setName(const SString&);
-        char getFormat(void) const;
+        SString getFormat(void) const;
 
         SString getComment(void) const;
@@ -107 +110 @@
         /// 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 using_checkpoints = false, bool *converter_missing = NULL);
+        Geno getConverted(SString otherformat, MultiMap *m = 0, bool using_checkpoints = false, bool *converter_missing = NULL);
 
         /// @return -1 = before first char in the string