Changeset 1559 in Sophya for trunk/SophyaLib/BaseTools

Timestamp:

Jul 2, 2001, 6:14:58 PM (24 years ago)

Author:

ansari

Message:

Modif MuTyV pour decodage ASCII - Reza 2/7/2001

Location:

trunk/SophyaLib/BaseTools

Files:

• mutyv.cc (modified) (3 diffs)
• sversion.h (modified) (1 diff)

trunk/SophyaLib/BaseTools/mutyv.cc

@@ -32 +32 @@
 
 
-static void mutyv_decodestr(const char * si, double& r, double& im);
+static void mutyv_decodestr(string const &, double& r, double& im);
+static inline void mutyv_decodestr_cp(const char * si, double& r, double& im)
+{
+  r = im = 0.;
+  string s = si;
+  mutyv_decodestr(s, r, im);
+}
 
 /* --Methode-- */
@@ -106 +112 @@
     char buff[96];
     if (typ == MTVInteger)  sprintf(buff,"%ld", (long)iv);
-    else if (typ == MTVFloat) sprintf(buff,"%.20g", dv);
-    else if (typ == MTVComplex) sprintf(buff,"(%.20g , %.20g)", dv, dv_im);
+    else if (typ == MTVFloat) sprintf(buff,"%g", dv);
+    else if (typ == MTVComplex) sprintf(buff,"(%g,%g)", dv, dv_im);
     else buff[0] = '\0';
     return(string(buff));
@@ -114 +120 @@
 
 
-static void mutyv_decodestr(const char * si, double& r, double& im)
+
+static void mutyv_decodestr(string const & s, 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);
+  size_t p = s.find_first_not_of(" \t",0);
+  size_t q,q2;
   if (p >= l) return;
-  size_t q = s.find_first_of(" ()\t",p+1);
-  
-  
+  if (s[p] == '(') {  // C'est un complexe
+    if ((q2=s.find(')',p)) >= l)  return; 
+    size_t pz = s.find_first_not_of(" \t",p+1);
+    size_t qz = q2;
+    if ((q=s.find(',',pz)) < q2) qz = q;
+    if (isdigit(s[pz]) || !(s[pz] == '+') || (s[pz] == '-') )  
+      r = atof(s.substr(pz,qz-pz).c_str());
+    else return;
+    if (qz == q) {
+      pz = s.find_first_not_of(" \t",qz+1);
+      if (isdigit(s[pz]) || (s[pz] == '+') || (s[pz] == '-') )  
+        im = atof(s.substr(pz,q2-pz).c_str());      
+    }
+  }
+
+  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());
+  im = 0.;
 }
 

trunk/SophyaLib/BaseTools/sversion.h

@@ -3 +3 @@
 
 #define SOPHYA_VERSION   1.1
-#define SOPHYA_REVISION  42
+#define SOPHYA_REVISION  44
 #define SOPHYA_TAG       "V_Jun2001"