Changeset 415 for cpp/frams/vm/classes

Timestamp:

07/14/15 00:42:32 (9 years ago)

Author:

Maciej Komosinski

Message:

Introduced a new field, is_valid, which combines isValid and validity, and is saved to .gen files

Location:

cpp/frams/vm/classes

Files:

• genoobj.cpp (modified) (2 diffs)
• genoobj.h (modified) (1 diff)

cpp/frams/vm/classes/genoobj.cpp

@@ -11 +11 @@
 ParamEntry geno_paramtab[]=
 {
-{"Geno",1,14,"Geno","All information about a single genotype.\nThis is a genetics-only object which does not contain any performance data. See also: Genotype class"},
+{"Geno",1,15,"Geno","All information about a single genotype.\nThis is a genetics-only object which does not contain any performance data. See also: Genotype class"},
 {"name",0,PARAM_NOSTATIC,"Name","s 0 40",GETSET(name),},
 {"rawgenotype",0,PARAM_NOSTATIC | PARAM_READONLY,"Raw genotype","s 1",GETONLY(genotype),"Genotype, excluding the format specifier"},
 {"info",0,PARAM_NOSTATIC,"Info","s 1",GETSET(info),"Additional information or comments",},
 {"format",0,PARAM_NOSTATIC | PARAM_READONLY,"Format","d",GETONLY(format),"Genotype format",},
-{"genotype",0,PARAM_NOSTATIC | PARAM_READONLY,"Genotype","s 1",GETONLY(string),},
-{"isValid",0,PARAM_NOSTATIC | PARAM_READONLY,"Valid","d 0 1",GETONLY(isvalid),},
+{"genotype",0,PARAM_NOSTATIC | PARAM_READONLY,"Genotype","s 1",GETONLY(string),"Genes as a string of characters",},
+{"isValid",0,PARAM_NOSTATIC | PARAM_READONLY | PARAM_DEPRECATED,"Valid","d 0 1",GETONLY(isvalid),},
+{"is_valid",0,PARAM_NOSTATIC,"Valid","d -1 1 -1",GETSET(isvalid),},
 {"getConverted",0,PARAM_NOSTATIC,"get converted genotype","p oGeno(d format)",PROCEDURE(p_getconvert),},
 {"f0genotype",0,PARAM_NOSTATIC | PARAM_READONLY,"f0 genotype","s 1",GETONLY(f0genotype),"converted to f0 genotype",},
@@ -32 +33 @@
 void GenoObj::get_isvalid(ExtValue *ret)
 {ret->setInt(isValid());}
+
+int GenoObj::set_isvalid(const ExtValue *v)
+{
+paInt n=v->getInt();
+if (getValid()!=n)
+        {
+        setValid(n);
+        return PSET_CHANGED;
+        }
+return 0;
+}
 
 void GenoObj::get_genotype(ExtValue *ret)

cpp/frams/vm/classes/genoobj.h

@@ -15 +15 @@
 #define STATRICKCLASS GenoObj
 PARAMGETDEF(isvalid);
+PARAMSETDEF(isvalid);
 PARAMGETDEF(genotype);
 PARAMGETDEF(name);