Changeset 514 for cpp/frams/genetics/f1

Timestamp:

05/23/16 13:53:25 (9 years ago)

Author:

Maciej Komosinski

Message:

More strict parsing of numbers when converting genotypes f1->f0

File:

• cpp/frams/genetics/f1/conv_f1.cpp (modified) (4 diffs)

cpp/frams/genetics/f1/conv_f1.cpp

@@ -431 +431 @@
 if (isdigit(begin[0]) || (begin[0]=='-'))
         {
-        double weight=atof(colon+1);
-        int relative=atoi(begin);
+        double weight=ExtValue::getDouble(trim(SString(colon+1,end-(colon+1))).c_str());
+        paInt relative=ExtValue::getInt(trim(SString(begin,colon-begin)).c_str(),false);
         int this_refno=neuro_f1_to_f0.size()-1;
         addOrRememberInput(this_refno,this_refno+relative,weight);
@@ -452 +452 @@
                 else if (cls->getPreferredLocation()==1) receptor->attachToPart(getLastPart());
                 }
-        last_f1_neuro->addInput(receptor,atof(colon+1));
+        last_f1_neuro->addInput(receptor,ExtValue::getDouble(trim(SString(colon+1,end-(colon+1))).c_str()));
         if (usemapping) receptor->addMapping(*makeRange(begin,end-1));
         }
@@ -458 +458 @@
         {
         Neuro *out=model.addNewNeuro();
-        out->addInput(last_f1_neuro,atof(colon+1));
+        out->addInput(last_f1_neuro,ExtValue::getDouble(trim(SString(colon+1,end-(colon+1))).c_str()));
         out->setClassName(SString(begin+1,end-colon-1));
         if (begin[1]=='@')
@@ -478 +478 @@
         if (usemapping) out->addMapping(*makeRange(begin,end-1));
         }
-else if (*begin=='!') addClassParam("fo",atof(colon+1));
-else if (*begin=='=') addClassParam("in",atof(colon+1));
-else if (*begin=='/') addClassParam("si",atof(colon+1));
+else if (*begin=='!') addClassParam("fo",ExtValue::getDouble(trim(SString(colon+1,end-(colon+1))).c_str()));
+else if (*begin=='=') addClassParam("in",ExtValue::getDouble(trim(SString(colon+1,end-(colon+1))).c_str()));
+else if (*begin=='/') addClassParam("si",ExtValue::getDouble(trim(SString(colon+1,end-(colon+1))).c_str()));
 else if (islower(begin[0]))
         {