Changeset 1157 in Sophya for trunk/SophyaLib/BaseTools/mutyv.cc

Timestamp:

Aug 29, 2000, 6:11:42 PM (25 years ago)

Author:

ansari

Message:

Declaration sa_size_t ds machdefs.h - Amelioration/correction DVList et MuTyV - Reza 29/8/2000

File:

• trunk/SophyaLib/BaseTools/mutyv.cc (modified) (7 diffs)

trunk/SophyaLib/BaseTools/mutyv.cc

@@ -32 +32 @@
 
 
+static void mutyv_decodestr(const char * si, double& r, double& im);
+
 /* --Methode-- */
 MuTyV::MuTyV(MuTyV const & a)
@@ -51 +53 @@
   typ = 'S';
   strv = new string(s);
-  dv = dv_im = 0.;
-  sscanf(s, "%lg %lg", &dv, &dv_im);
+  mutyv_decodestr(s, dv, dv_im);
   iv = (int_8)dv;
 }
@@ -61 +62 @@
   typ = 'S';
   strv = new string(s);
-  dv = dv_im = 0.;
-  sscanf(s.c_str(), "%lg %lg", &dv, &dv_im);
+  mutyv_decodestr(s.c_str(), dv, dv_im);
   iv = (int_8)dv;
 }
@@ -80 +80 @@
   typ = 'S';
   strv = new string(s);
-  dv = dv_im = 0.;
-  sscanf(s, "%lg %lg", &dv, &dv_im);
+  mutyv_decodestr(s, dv, dv_im);
   iv = (int_8)dv;
   return(s);
@@ -91 +90 @@
   typ = 'S';
   strv = new string(s);
-  dv = dv_im = 0.;
-  sscanf(s.c_str(), "%lg %lg", &dv, &dv_im);
+  mutyv_decodestr(s.c_str(), dv, dv_im);
   iv = (int_8)dv;
   return(s);
@@ -105 +103 @@
     if (typ == 'I')  sprintf(buff,"%ld", (long)iv);
     else if (typ == 'D') sprintf(buff,"%.20g", dv);
-    else if (typ == 'Z') sprintf(buff,"%.20g %.20g i", dv, dv_im);
+    else if (typ == 'Z') sprintf(buff,"(%.20g , %.20g)", dv, dv_im);
     else buff[0] = '\0';
     return(string(buff));
@@ -112 +110 @@
 
 
+static void mutyv_decodestr(const char * si, double& r, double& im)
+  // decodage d'une chaine contenant une ou deux valeurs
+{
+  r = im = 0.;
+  string s = si;
+  size_t l = s.length();
+  size_t p = s.find_first_not_of(" ()\t",0);
+  if (p >= l) return;
+  size_t q = s.find_first_of(" ()\t",p+1);
+  
+  
+  if (!isdigit(s[p]) && !(s[p] == '+') && !(s[p] == '-') )
+    return;
+  r = atof(s.substr(p,q-p).c_str());
+
+  p = s.find_first_not_of(" ()\t",q+1);
+  if (p >= l) return;
+  q = s.find_first_of(" ()\t",p+1);
+  if (!isdigit(s[p]) && !(s[p] == '+') && !(s[p] == '-') )
+    return;
+  im = atof(s.substr(p,q-p).c_str());
+}
 
 
 
+