Changeset 1080 in Sophya for trunk/SophyaLib/BaseTools/dvlist.h

Timestamp:

Jul 24, 2000, 2:49:24 PM (25 years ago)

Author:

ansari

Message:

Classe MuTyV separe et etendu pour support complexe - Reza 24/7/2000

File:

• trunk/SophyaLib/BaseTools/dvlist.h (modified) (4 diffs)

trunk/SophyaLib/BaseTools/dvlist.h

@@ -9 +9 @@
 
 #include <stdio.h>
-
 #include <iostream.h>
 
+#include "mutyv.h"
 #include <list>
 #include <map>
-#include <string.h>
-#include <string>
 
 namespace SOPHYA {
-
-// Classe utilitaire pour manipuler des variables typees 
-//! A simple class for holding string, integer and float type values.
-class MuTyV {
-public:
-  union {
-  int_8 iv;
-  r_8 dv;
-  char strv[39];
-  } mtv; 
-  char typ;
-
-  static char myStrBuf[64];  
-
-  inline MuTyV() { typ = 'I'; mtv.iv = 0;  mtv.dv = 0.;  mtv.strv[0] ='\0'; }
-  inline MuTyV(MuTyV const & a) { typ = a.typ; mtv = a.mtv; }
-  inline MuTyV(int_4 i) { typ = 'I'; mtv.iv = (int_8)i; mtv.dv = 0.;  mtv.strv[0] ='\0'; }
-  inline MuTyV(int_8 i) { typ = 'I'; mtv.iv = i; mtv.dv = 0.;  mtv.strv[0] ='\0'; }
-  inline MuTyV(r_4 f) { typ = 'D'; mtv.dv = (r_8)f;  mtv.iv = 0;  mtv.strv[0] ='\0'; }
-  inline MuTyV(r_8 d) { typ = 'D'; mtv.dv = d; mtv.iv = 0;  mtv.strv[0] ='\0'; }
-  inline MuTyV(char const* s)  { typ = 'S'; strncpy(mtv.strv, s, 39); mtv.strv[38] = '\0'; }
-  inline MuTyV(string const& s) { typ = 'S'; strncpy(mtv.strv, s.c_str(), 39); mtv.strv[38] = '\0'; }
-  inline MuTyV & operator= (MuTyV const & a) { typ = a.typ; mtv = a.mtv; return(*this); }
-  inline int_4  operator= (int_4 v)  { typ = 'I'; mtv.iv = (int_8)v; return(v); }
-  inline int_8  operator= (int_8 v)  { typ = 'I'; mtv.iv = v; return(v); }
-  inline r_4  operator= (r_4 v)  { typ = 'D'; mtv.dv = (r_8)v; return(v); }
-  inline r_8 operator= (r_8 v) { typ = 'D'; mtv.dv = v; return(v); }
-  inline char*  operator= (char* s)  { typ = 'S'; strncpy(mtv.strv, s, 39); 
-                                       mtv.strv[38] = '\0';  return(s); }
-  inline string& operator= (string& s)    { typ = 'S'; strncpy(mtv.strv, s.c_str(), 39); 
-                                            mtv.strv[38] = '\0'; return(s); }
-
-  inline operator int_4() { if (typ == 'I')  return((int_4)mtv.iv);
-                            else if (typ == 'D') return((int_4)mtv.dv); 
-                            else return(atol(mtv.strv)); }
-  inline operator int_8() { if (typ == 'I')  return((int_8)mtv.iv);
-                            else if (typ == 'D') return((int_8)mtv.dv); 
-                            else return(atol(mtv.strv)); }
-  inline operator r_4() { if (typ == 'I')  return((r_4)mtv.iv);
-                            else if (typ == 'D') return((r_4)mtv.dv); 
-                            else return((r_4)atof(mtv.strv)); }
-  inline operator r_8() { if (typ == 'I')  return((r_8)mtv.iv);
-                            else if (typ == 'D') return(mtv.dv); 
-                            else return(atof(mtv.strv)); }
-  inline operator string() { char *ss=myStrBuf;
-                            if (typ == 'I')  sprintf(ss,"%ld", (long)mtv.iv);
-                            else if (typ == 'D') sprintf(ss,"%.20g", mtv.dv);
-                            else ss = mtv.strv;
-                            return(ss); }
-};
 
 //  Classe liste de variables  Dynamic Variable List  
@@ -74 +22 @@
 class DVList : public AnyDataObj {
 public:
-//  enum {classId = ClassId_DVList };
 
                     DVList();
@@ -89 +36 @@
   int_8             GetI(string const& key, int_8 def=-1);
   r_8               GetD(string const& key, r_8 def=-9.e19);
+  complex<r_8>      GetZ(string const& key, complex<r_8> def=-9.e19);
   string            GetS(string const& key, char* def="");
   string            GetComment(string const& key);
@@ -94 +42 @@
   void              SetI(string const& key, int_8 val);
   void              SetD(string const& key, r_8 val);
+  void              SetZ(string const& key, complex<r_8> val);
   void              SetS(string const& key, char const*  val);
-  void              SetS(string const& key, string val);
+  void              SetS(string const& key, string const& val);
   void              SetComment(string const& key, string const& comm);