Changeset 718 in Sophya for trunk/SophyaLib/NTools/dvlist.h

Timestamp:

Feb 6, 2000, 4:05:44 PM (26 years ago)

Author:

ansari

Message:

Ajout commentaire/variable ds DVList - Remplacement float/double par r_4 r_8
Ajout classe XNTuple (importe/adapte depuis PEIDA) - Reza 7 Fev 2000

File:

• trunk/SophyaLib/NTools/dvlist.h (modified) (5 diffs)

trunk/SophyaLib/NTools/dvlist.h

@@ -23 +23 @@
 public:
   union {
-  int_4 iv;
-  double dv;
+  int_8 iv;
+  r_8 dv;
   char strv[31];
   } mtv; 
@@ -32 +32 @@
 
   inline MuTyV() { typ = 'I'; mtv.iv = 0;  mtv.dv = 0.;  mtv.strv[0] ='\0'; }
-  inline MuTyV(int_4 i) { typ = 'I'; mtv.iv = i; mtv.dv = 0.;  mtv.strv[0] ='\0'; }
-  inline MuTyV(float f) { typ = 'D'; mtv.dv = (double)f;  mtv.iv = 0;  mtv.strv[0] ='\0'; }
-  inline MuTyV(double d) { typ = 'D'; mtv.dv = d; mtv.iv = 0;  mtv.strv[0] ='\0'; }
+  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, 31); mtv.strv[30] = '\0'; }
   inline MuTyV(string const& s) { typ = 'S'; strncpy(mtv.strv, s.c_str(), 31); mtv.strv[30] = '\0'; }
-  inline int_4  operator= (int_4 v)  { typ = 'I'; mtv.iv = v; return(v); }
-  inline float  operator= (float v)  { typ = 'D'; mtv.dv = (double)v; return(v); }
-  inline double operator= (double v) { typ = 'D'; mtv.dv = v; return(v); }
+  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, 31); 
                                        mtv.strv[30] = '\0';  return(s); }
@@ -45 +47 @@
                                             mtv.strv[30] = '\0'; return(s); }
 
-  inline operator int_4() { if (typ == 'I')  return(mtv.iv);
+  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 float() { if (typ == 'I')  return((float)mtv.iv);
-                            else if (typ == 'D') return((float)mtv.dv); 
-                            else return((float)atof(mtv.strv)); }
-  inline operator double() { if (typ == 'I')  return((double)mtv.iv);
+  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)); }
@@ -78 +83 @@
   DVList&           Merge(const DVList&);
 
-  int_4             GetI(string const& key, int_4 def=-1);
-  double            GetD(string const& key, double def=-9.e19);
+  int_8             GetI(string const& key, int_8 def=-1);
+  r_8               GetD(string const& key, r_8 def=-9.e19);
   string            GetS(string const& key, char* def="");
+  string            GetComment(string const& key);
 
-  void              SetI(string const& key, int_4 val);
-  void              SetD(string const& key, double val);
+  void              SetI(string const& key, int_8 val);
+  void              SetD(string const& key, r_8 val);
   void              SetS(string const& key, char const*  val);
   void              SetS(string const& key, string val);
+  void              SetComment(string const& key, string const& comm);
 
   MuTyV&            Get(string const& key);
@@ -95 +102 @@
   virtual void      Print(ostream& os)  const;
 
-  typedef map<string, MuTyV, less<string> >  ValList; 
+// Chaque element dans un DVList est constitue desormais d'un MuTyV
+// et d'une chaine de caracteres (commentaire) regroupe dans la structure
+// dvlElement. Ces elements sont associes aux noms de variables dans un 
+// map<...> ValList.            Reza 02/2000
+
+  struct dvlElement {MuTyV elval; string elcomm; } ;
+  typedef map<string, dvlElement, less<string> >  ValList; 
   inline ValList::const_iterator Begin() { return(mvlist.begin()); } 
   inline ValList::const_iterator End() { return(mvlist.end()); } 
   
-//  int_4             ClassId() const        { return classId; }
-//  static PPersist*  Create()               { return new DVList;}
-
-//  virtual void      WriteSelf(POutPersist&) const;
-//  virtual void      ReadSelf(PInPersist&);
 
 private: