Changeset 895 in Sophya for trunk/SophyaLib/SUtils/datacards.h

Timestamp:

Apr 12, 2000, 7:49:54 PM (25 years ago)

Author:

ansari

Message:

Documentation de fichiers - Reza 12/4/2000

File:

• trunk/SophyaLib/SUtils/datacards.h (modified) (5 diffs)

trunk/SophyaLib/SUtils/datacards.h

@@ -1 +1 @@
 // This may look like C code, but it is really -*- C++ -*-
 //
-// $Id: datacards.h,v 1.1 2000-03-02 16:10:59 ansari Exp $
+// $Id: datacards.h,v 1.2 2000-04-12 17:49:43 ansari Exp $
 //
 // Datacards, acquisition EROS II
@@ -14 +14 @@
 #define DATACARDS_SEEN
 
+#include "machdefs.h"
 #include <string.h>
 #include <string>
@@ -19 +20 @@
 #include <list>
 #include <vector>
-#include <string>
 
-#include "peida.h"
+
+namespace SOPHYA {  
 
 typedef int (*ProcCard)(string const& key, string const& toks);
  
-class DataCards EXC_AWARE {
+//! Class for decoding parameters from  an ascii file.
+    
+class DataCards  {
 public:
+
    DataCards();                  
    DataCards(string const& fn);
 
-           // nom dans variable d'environnement PEIDA_DATACARDS
-           // par defaut, peida.datacards                        
+           // nom dans variable d'environnement SOPHYA_DATACARDS
+           // par defaut, sophya.datacards                        
            // Si pas chemin complet, on tente dans repertoire 
-           // en cours, puis dans PEIDA_WORK
+           // en cours, puis dans SOPHYA_WORK
 
    virtual ~DataCards() {}
@@ -50 +54 @@
    double  DParam(string const& key, int numero = 0, double def = 0);
    
-   friend ostream& operator << (ostream& s, DataCards c);
+   void    Print(ostream& s) const;
 
-public:
+protected:
    struct Card {
      string kw;
      vector<string> tokens;
-         STRUCTCOMPF(Card,kw)
+     bool operator == (Card const & b) const { return(kw == b.kw); }
+     bool operator < (Card const & b) const { return(kw < b.kw); }
    };
-   typedef list<Card> CardList;
    struct CrdPF {
      ProcCard pf;
      string  patt;
-         STRUCTCOMPF(CrdPF,pf)
+     bool operator == (CrdPF const & b) const { return(pf == b.pf); }
+     bool operator < (CrdPF const & b) const { return(pf == b.pf); }
    };
-   typedef list<CrdPF> CrdPFList;
-protected:
-   CardList cards;
-   CrdPFList cpfs;
 
    void  DoReadFile(string const& fn);
@@ -77 +78 @@
    
    Card* FindKey(string const& key);
+
+   typedef list<Card> CardList;
+   typedef list<CrdPF> CrdPFList;
+   CardList cards;
+   CrdPFList cpfs;
+
    struct KeyEq : binary_function<Card, string, bool> {
     bool operator()(const Card& x, const string& y) const { return x.kw == y; }
    };
 };
+
+//! operator << overloading - calls Print()
+inline ostream& operator << (ostream& s, DataCards c)
+{ c.Print(s); return s; }
+
+} // namespace SOPHYA
+
 #endif