ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/GenericData.hpp
(Generate patch)

Comparing trunk/OOPSE/libmdtools/GenericData.hpp (file contents):
Revision 736 by tim, Thu Aug 28 21:09:47 2003 UTC vs.
Revision 1091 by tim, Tue Mar 16 19:22:56 2004 UTC

# Line 10 | Line 10
10   #define ZCONSFILENAME_ID     "ZCONSFILENAME"
11   #define ZCONSTOL_ID              "ZCONSTOL"
12   #define ZCONSFORCEPOLICY_ID "ZCONSFORCEPOLICY"
13 + #define ZCONSGAP_ID "ZCONSGAP"
14 + #define ZCONSFIXTIME_ID "ZCONSFIXTIME"
15  
16 + #define CHIVALUE_ID "CHIVALUE"
17 + #define INTEGRALOFCHIDT_ID "INTEGRALOFCHIDT"
18 + #define ETAVALUE_ID "ETAVALUE"
19 +
20   using namespace std;
21  
22   class GenericData
# Line 20 | Line 26 | class GenericData
26      GenericData(const GenericData& rhs)  {  id = rhs.getID(); }
27      GenericData& operator =(const GenericData& rhs);
28      virtual ~GenericData() {}
29 <    
29 >
30      const string& getID() const {  return id; }
31 <    void setID(string rhs)     {  id = rhs;  }
32 <    
31 >    void setID(string rhs)     {  id = rhs;  }
32 >
33    protected:
34      string id;
35   };
36  
37   /** Something we can improve it here is to use template
38 < **
38 > **
39   */
40   class DoubleData : public GenericData{
41  
# Line 37 | Line 43 | class DoubleData : public GenericData{
43  
44      double getData()         { return data; }
45      void setData(double rhs) { data = rhs;  }
46 <            
46 >
47    protected:
48      double data;
49   };
50  
51   class StringData : public GenericData{
52 <
53 <  public:  
52 >
53 >  public:
54      const string& getData() const  {  return data; }
55      void setData(const string& rhs) {  data = rhs;  }
56    protected:
57 <    string data;
57 >    string data;
58   };
59  
60 < struct ZConsParaItem
55 < {
60 > struct ZConsParaItem {
61    int zconsIndex;
62    bool havingZPos;
63    double zPos;
# Line 60 | Line 65 | class ZConsParaData : public GenericData{
65   };
66  
67   class ZConsParaData : public GenericData{
68 <        
69 <  public:      
68 >
69 >  public:
70      ZConsParaData();
71      void addItem(ZConsParaItem& item) {data.push_back(item);}
72      vector<ZConsParaItem>* getData() {return &data;}
73      void setData(vector<ZConsParaItem>& theData) {data = theData;}
74      void sortByIndex();
75      bool isIndexUnique();
76 <        
77 <  private:      
76 >
77 >  private:
78      vector<ZConsParaItem> data;
79    };
80  
# Line 81 | Line 86 | class ZConsParaSortCriterion{
86  
87   };
88  
89 + class DoubleArrayData : public GenericData{
90 +
91 + public:
92 +   vector<double> getData() const  {  return data; }
93 +   void setData(double* source, int num){
94 +    data.clear();
95 +    for(int i = 0; i < num; i++)
96 +     data.push_back(source[i]);
97 +   }
98 + protected:
99 +   vector<double> data;
100 + };
101   #endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines