Changeset 71 for cpp

Timestamp:

02/05/11 00:53:44 (14 years ago)

Author:

sz

Message:

optional external validators for Geno

Location:

cpp/gdk

Files:

• geno.cpp (modified) (2 diffs)
• geno.h (modified) (2 diffs)

cpp/gdk/geno.cpp

@@ -5 +5 @@
 #include "geno.h"
 #include "model.h"
+
+SListTempl<GenoValidator*> Geno::validators;
 
 void Geno::init(const SString& genstring,int genformat,const SString& genname,const SString& comment)
@@ -206 +208 @@
 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)
+{
+if (g.getFormat()=='0')
+        {
+        Model mod(g);
+        return mod.isValid();
+        }
+else
+        {
+        Geno f0geno=g.getConverted('0');
+        return f0geno.isValid();
+        }
+}
+
+static ModelGenoValidator default_validator;
+
 void Geno::validate()
 {
 if (isvalid>=0) return;
 if (gen.len()==0) { isvalid=0; return; }
-if (getFormat()=='0')
-        {
-        Model mod(*this);
-        isvalid=mod.isValid();
-        }
-else
-        {
-        Geno f0geno=getConverted('0');
-        f0geno.validate();
-        isvalid=f0geno.isvalid;
-        }
+FOREACH(GenoValidator*,v,validators)
+        if ((isvalid=v->testGenoValidity(*this))>=0)
+                break;
 }
 

cpp/gdk/geno.h

@@ -10 +10 @@
 
 class MultiMap;
+class Geno;
+
+class GenoValidator
+{
+  public:
+virtual int testGenoValidity(Geno& g)=0;/// -1=no information  0=invalid  1=valid
+};
 
 /// basic information about a single genotype.
@@ -96 +103 @@
 
 void* owner;
+static SListTempl<GenoValidator*> validators;
 };