Changeset 988 for cpp/frams/genetics/geno.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/geno.h (modified) (2 diffs)

cpp/frams/genetics/geno.h

@@ -55 +55 @@
 
 public:
-        static const SString INVALID_FORMAT;
-        static const SString UNKNOWN_FORMAT;
+        static const SString FORMAT_INVALID;
+        static const SString FORMAT_UNKNOWN;
         typedef SListTempl<GenoValidator*> Validators;
 
@@ -93 +93 @@
 
         /** @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);
+        void setGenesAndFormat(const SString& genstring, const SString& genformat = FORMAT_UNKNOWN);
         /** g must be pure genes, without format. For the standard behavior use setGenesAndFormat() */
         void setGenesAssumingSameFormat(const SString& g);