Changeset 81 for cpp/gdk/param.cpp

Timestamp:

02/08/13 03:29:17 (12 years ago)

Author:

Maciej Komosinski

Message:

improved parsing of properties (e.g. in f0 genotypes)

File:

• cpp/gdk/param.cpp (modified) (5 diffs)

cpp/gdk/param.cpp

@@ -283 +283 @@
 }
 
-void SimpleAbstractParam::save2(SString& f,void *defdata,int addcr)
+void SimpleAbstractParam::save2(SString& f,void *defdata,bool addcr,bool all_names)
 { // defdata!=NULL -> nie zapisuje wartosci domyslnych
 const char *p;
@@ -303 +303 @@
 #ifndef SAVE_ALL_NAMES
 #ifdef SAVE_SELECTED_NAMES
-                if (needlabel || !(fl & PARAM_CANOMITNAME))
+                if (needlabel || all_names || !(fl & PARAM_CANOMITNAME))
 #else
                 if (needlabel)
@@ -312 +312 @@
                         { // string - special case
                         SString str=getString(i);
-                        if (strContainsOneOf(str,", \\\n\r\t"))
+                        if (strContainsOneOf(str,", \\\n\r\t\""))
                                 {
                                 t+="\"";
@@ -439 +439 @@
 }
 
+static bool stringIsNumeric(const char* str)
+{//   /-?.?[0-9]+/
+if (!str) return false;
+if (*str=='-') str++;
+if (*str=='.') str++;
+return isdigit(*str);
+}
+
+int ParamInterface::setInt(int i,const char* str)
+{
+if (!stringIsNumeric(str))
+        {
+        long a,b,c;
+        if (getMinMax(i,a,b,c)>=3)
+                return setInt(i,c);
+        else
+                return setInt(i,(long)0);
+        }
+else
+        return setInt(i,atol(str));
+}
+
+int ParamInterface::setDouble(int i,const char* str)
+{
+if (!stringIsNumeric(str))
+        {
+        double a,b,c;
+        if (getMinMax(i,a,b,c)>=3)
+                return setDouble(i,c);
+        else
+                return setDouble(i,(double)0);
+        }
+else
+        return setDouble(i,atof(str));
+}
+
 int ParamInterface::set(int i,const ExtValue &v)
 {
 switch(type(i)[0])
         {
-        case 'd': return setInt(i,v.getInt());
-        case 'f': return setDouble(i,v.getDouble());
+        case 'd': if ((v.type==TInt)||(v.type==TDouble)) return setInt(i,v.getInt()); else return setInt(i,(const char*)v.getString());
+        case 'f': if ((v.type==TInt)||(v.type==TDouble)) return setDouble(i,v.getDouble()); else return setDouble(i,(const char*)v.getString());
         case 's': { SString t=v.getString(); return setString(i,t); }
         case 'o': return setObject(i,v.getObject());
@@ -457 +493 @@
 switch(type(i)[0])
         {
-        case 'd': return setInt(i,atol(v));
-        case 'f': return setDouble(i,atof(v));
+        case 'd': return setInt(i,v);
+        case 'f': return setDouble(i,v);
         case 's': { SString t(v); return setString(i,t); }
         case 'x':