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 789 by mmeineke, Mon Sep 29 17:38:00 2003 UTC vs.
Revision 837 by tim, Wed Oct 29 00:19:10 2003 UTC

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

Diff Legend

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