Changeset 393 for cpp/frams/model

Timestamp:

06/03/15 17:57:46 (9 years ago)

Author:

sz

Message:

f0 parsing corrections and enhancements:

• f0 genotype becomes invalid if any of its numeric fields can't be parsed
• ParamInterface::set and ParamInterface::load2 return the error flag if a numeric parsing error occured
• fixed a bug in load2 (was failing on quoted fields containing a comma)

File:

• cpp/frams/model/model.cpp (modified) (6 diffs)

cpp/frams/model/model.cpp

@@ -570 +570 @@
         partparam.select(p);
         pos+=2;
-        partparam.load2(line,pos);
+        if (partparam.load2(line,pos) & ParamInterface::LOAD2_PARSE_FAILED) return -1;
         p->o.rotate(p->rot);
         parts+=p;
@@ -582 +582 @@
         modelparam.select(this);
         pos+=2;
-        modelparam.load2(line,pos);
+        if (modelparam.load2(line,pos) & ParamInterface::LOAD2_PARSE_FAILED) return -1;
         return 0;
         }
@@ -592 +592 @@
         pos+=2;
         j->owner=this;
-        jointparam.load2(line,pos);
+        if (jointparam.load2(line,pos) & ParamInterface::LOAD2_PARSE_FAILED) return -1;
         if ((j->p1_refno>=0)&&(j->p1_refno<getPartCount())&&
            (j->p2_refno>=0)&&(j->p2_refno<getPartCount()))
@@ -620 +620 @@
         neuroparam.select(nu);
         pos+=2;
-        neuroparam.load2(line,pos);
+        if (neuroparam.load2(line,pos) & ParamInterface::LOAD2_PARSE_FAILED) return -1;
 #ifdef MODEL_V1_COMPATIBLE
         if (nu->neuro_refno>=0) // parent specified...
@@ -684 +684 @@
         ncparam.select(&c);
         pos+=2;
-        ncparam.load2(line,pos);
+        if (ncparam.load2(line,pos) & ParamInterface::LOAD2_PARSE_FAILED) return -1;
         if ((c.n1_refno>=0)&&(c.n1_refno<getNeuroCount())&&(c.n2_refno>=0)&&(c.n2_refno<getNeuroCount()))
                 {
@@ -706 +706 @@
         neuroitemparam.select(nu);
         pos+=3;
-        neuroitemparam.load2(line,pos);
+        if (neuroitemparam.load2(line,pos) & ParamInterface::LOAD2_PARSE_FAILED) return -1;
         // illegal parent?
         if ((nu->neuro_refno<0)||(nu->neuro_refno>=old_getNeuroCount()))