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

Timestamp:

07/18/16 04:16:11 (8 years ago)

Author:

Maciej Komosinski

Message:

Strict parsing of genotype format prefix

File:

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

cpp/frams/genetics/geno.h

@@ -55 +55 @@
 
 public:
-        static const int INVALID_FORMAT = '!';
+        static const char INVALID_FORMAT = '!';
         typedef SListTempl<GenoValidator*> Validators;
 
@@ -85 +85 @@
 
         /// return string representation, with format comment at the beginning
-        SString toString(void) const;
-        SString shortString(void) const;
+        SString getGeneAndFormat(void) const;
 
         void setString(const SString& genewithcomments);
 
-        /** @param newformat=-1 -> don't change */
-        void setGene(const SString& g, char newformat = -1);
+        /** @param genformat=-1 -> take from genstring comment (like the constructor) else specify the valid format in genformat and pure gene in genstring */
+        void setGeneAndFormat(const SString& genstring, char genformat=-1);
+        /** g must be pure gene, without format. for the standard behavior use setGeneAndFormat() */
+        void setGeneOnly(const SString& g);
         SString getGene(void) const;