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

Timestamp:

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

Author:

Maciej Komosinski

Message:

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

File:

• cpp/frams/genetics/genoconv.h (modified) (5 diffs)

cpp/frams/genetics/genoconv.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.
 
@@ -43 +43 @@
 public:
         const char *name;       //< converter name (short)
-        char in_format,         //< input format, eg. '1'
-                out_format;     //< output format, eg. '0'
+        SString in_format,      //< input format, eg. "1"
+                out_format;     //< output format, eg. "0"
         paInt enabled;  //< don't touch this! (used by configuration module)
         paInt mapsupport; //< set to 1 if your converter supports genotype mapping
@@ -56 +56 @@
         virtual ~GenoConverter() {}
         /// Don't forget to set public fields in your constructor
-        GenoConverter() :name(""), in_format(-1), out_format('0'), enabled(1), mapsupport(0) {}
+        GenoConverter() :name(""), in_format(Geno::UNKNOWN_FORMAT), out_format("0"), enabled(1), mapsupport(0) {}
 };
 
@@ -77 +77 @@
         /// make a genotype in other format. genotype will be invalid
         /// if GenoConvManager cannot convert it.
-        Geno convert(Geno &in, char format, MultiMap *map = 0, bool using_checkpoints = false, bool *converter_missing = NULL);
+        Geno convert(Geno &in, SString format, MultiMap *map = 0, bool using_checkpoints = false, bool *converter_missing = NULL);
         /// register GenoConverter, the added object will be automatically deleted when GenoConvManager is destructed (call removeConverter() if this is not desirable)
         void addConverter(GenoConverter *conv);
@@ -83 +83 @@
         void removeConverter(GenoConverter *conv);
 
-        char *getPath(char in, char out, char *path, int maxlen, int *mapavailable = 0);
-        char *getFormatPath(char in, char out, char *path, int maxlen, int *mapavailable = 0);
+        GenoConverter **getPath(const SString& in, const SString& out, GenoConverter **path, int maxlen, int *mapavailable = 0);
         /// returns the list of converters meeting the specified criteria
         /// pass result=0 if you only need one result (by return value)
         /// default criteria values mean "don't care", pass anything else to narrow your search
-        GenoConverter *findConverters(SListTempl<GenoConverter*>* result = 0, char in = -1, char out = -1, int enabled = -1, char* name = 0);
+        GenoConverter *findConverters(SListTempl<GenoConverter*>* result = 0, const SString& in = Geno::UNKNOWN_FORMAT, const SString& out = Geno::UNKNOWN_FORMAT, int enabled = -1, char* name = 0);
 };