Changeset 145 for cpp/frams/genetics/geno.cpp

Timestamp:

02/26/14 20:21:22 (10 years ago)

Author:

sz

Message:

Genetics reorganization (affects ALL applications!):

• Converters/Validators? are now configured/initialized in a more verbose but also less confusing way
• At the same time, the PreconfiguredGenetics? object will help you avoid the increased complexity by creating the ready-to-use environment that is sufficient in 99% of cases (see the demos)
• Format F genetics updated (work in progress)

File:

• cpp/frams/genetics/geno.cpp (modified) (4 diffs)

cpp/frams/genetics/geno.cpp

@@ -4 +4 @@
 
 #include "geno.h"
+#include "genoconv.h"
 #include <frams/model/model.h>
 
 SListTempl<GenoValidator*> Geno::validators;
+GenoConvManager *Geno::converters=NULL;
 
 void Geno::init(const SString& genstring,char genformat,const SString& genname,const SString& comment)
@@ -209 +211 @@
 SString Geno::getComment(void) const {return txt;}
 
-class ModelGenoValidator: public GenoValidator
-{
-public:
-        ModelGenoValidator();
-        int testGenoValidity(Geno& g);
-};
-
-ModelGenoValidator::ModelGenoValidator()
-{
-Geno::validators+=this;
-}
-
 int ModelGenoValidator::testGenoValidity(Geno& g)
 {
@@ -234 +224 @@
         }
 }
-
-static ModelGenoValidator default_validator;
 
 void Geno::validate()
@@ -256 +244 @@
 if (otherformat==getFormat()) return *this;
 #ifndef NO_GENOCONVMANAGER
-if ((otherformat=='0')&&(!m))
-        {
-        if (!f0gen)
-                f0gen=new Geno(GenoConvManager::globalConvert(*this,otherformat));
-        return *f0gen;
-        }
-else
-        return GenoConvManager::globalConvert(*this,otherformat,m);
-#else
+if (converters)
+        {
+        if ((otherformat=='0')&&(!m))
+                {
+                if (!f0gen)
+                        f0gen=new Geno(converters->convert(*this,otherformat));
+                return *f0gen;
+        }
+        else
+                return converters->convert(*this,otherformat,m);
+        }
+#endif
 return (otherformat==getFormat())?*this:Geno(0,0,0,"GenConvManager not available");
-#endif
 }