Changeset 415 for cpp/frams


Ignore:
Timestamp:
07/14/15 00:42:32 (6 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:
2 edited

Legend:

Unmodified
Added
Removed
  • cpp/frams/vm/classes/genoobj.cpp

    r286 r415  
    1111ParamEntry geno_paramtab[]=
    1212{
    13 {"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"},
     13{"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"},
    1414{"name",0,PARAM_NOSTATIC,"Name","s 0 40",GETSET(name),},
    1515{"rawgenotype",0,PARAM_NOSTATIC | PARAM_READONLY,"Raw genotype","s 1",GETONLY(genotype),"Genotype, excluding the format specifier"},
    1616{"info",0,PARAM_NOSTATIC,"Info","s 1",GETSET(info),"Additional information or comments",},
    1717{"format",0,PARAM_NOSTATIC | PARAM_READONLY,"Format","d",GETONLY(format),"Genotype format",},
    18 {"genotype",0,PARAM_NOSTATIC | PARAM_READONLY,"Genotype","s 1",GETONLY(string),},
    19 {"isValid",0,PARAM_NOSTATIC | PARAM_READONLY,"Valid","d 0 1",GETONLY(isvalid),},
     18{"genotype",0,PARAM_NOSTATIC | PARAM_READONLY,"Genotype","s 1",GETONLY(string),"Genes as a string of characters",},
     19{"isValid",0,PARAM_NOSTATIC | PARAM_READONLY | PARAM_DEPRECATED,"Valid","d 0 1",GETONLY(isvalid),},
     20{"is_valid",0,PARAM_NOSTATIC,"Valid","d -1 1 -1",GETSET(isvalid),},
    2021{"getConverted",0,PARAM_NOSTATIC,"get converted genotype","p oGeno(d format)",PROCEDURE(p_getconvert),},
    2122{"f0genotype",0,PARAM_NOSTATIC | PARAM_READONLY,"f0 genotype","s 1",GETONLY(f0genotype),"converted to f0 genotype",},
     
    3233void GenoObj::get_isvalid(ExtValue *ret)
    3334{ret->setInt(isValid());}
     35
     36int GenoObj::set_isvalid(const ExtValue *v)
     37{
     38paInt n=v->getInt();
     39if (getValid()!=n)
     40        {
     41        setValid(n);
     42        return PSET_CHANGED;
     43        }
     44return 0;
     45}
    3446
    3547void GenoObj::get_genotype(ExtValue *ret)
  • cpp/frams/vm/classes/genoobj.h

    r286 r415  
    1515#define STATRICKCLASS GenoObj
    1616PARAMGETDEF(isvalid);
     17PARAMSETDEF(isvalid);
    1718PARAMGETDEF(genotype);
    1819PARAMGETDEF(name);
Note: See TracChangeset for help on using the changeset viewer.