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

Timestamp:

07/09/20 00:13:20 (4 years ago)

Author:

Maciej Komosinski

Message:

Building a Model from Geno now fails when Model.shape is incompatible with Geno.format; renamed enum constants for genetic formats: xxx_FORMAT => FORMAT_xxx

File:

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

cpp/frams/genetics/genoconv.h

@@ -56 +56 @@
         virtual ~GenoConverter() {}
         /// Don't forget to set public fields in your constructor
-        GenoConverter() :name(""), in_format(Geno::UNKNOWN_FORMAT), out_format("0"), enabled(1), mapsupport(0) {}
+        GenoConverter() :name(""), in_format(Geno::FORMAT_UNKNOWN), out_format("0"), enabled(1), mapsupport(0) {}
 };
 
@@ -87 +87 @@
         /// 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, const SString& in = Geno::UNKNOWN_FORMAT, const SString& out = Geno::UNKNOWN_FORMAT, int enabled = -1, char* name = 0);
+        GenoConverter *findConverters(SListTempl<GenoConverter*>* result = 0, const SString& in = Geno::FORMAT_UNKNOWN, const SString& out = Geno::FORMAT_UNKNOWN, int enabled = -1, char* name = 0);
 };