--- trunk/OOPSE/libmdtools/GenericData.hpp	2003/08/12 16:08:05	681
+++ trunk/OOPSE/libmdtools/GenericData.hpp	2003/08/12 17:51:33	682
@@ -1,9 +1,15 @@
 #ifndef __GENERICDATA_H__
 #define __GENERICDATA_H__
 
+#include <algorithm>
 #include <string>
 #include <vector>
 
+#define ZCONSTIME_ID            "ZCONSTIME"
+#define ZCONSPARADATA_ID    "ZCONSPARA"
+#define ZCONSFILENAME_ID     "ZCONSFILENAME"
+#define ZCONSTOL_ID              "ZCONSTOL"
+
 using namespace std;
 
 class GenericData
@@ -24,19 +30,6 @@ class GenericData
 /** Something we can improve it here is to use template
  ** 
  */
-class IndexData : public GenericData
-{
-  public:
-    IndexData();
-    IndexData(const IndexData& rhs);
-    IndexData& operator = (const IndexData& rhs);
-    
-    const vector<int>& getIndexData() const   {  return indexData; }
-    void setIndexData(const vector<int>& rhs) {  indexData = rhs;  }
-  protected:
-    vector<int> indexData;  
-};
-
 class DoubleData : public GenericData{
 
   public:
@@ -56,4 +49,34 @@ class StringData : public GenericData{
   protected:
     string data; 
 };
+
+struct ZConsParaItem 
+{
+  int zconsIndex;
+  bool havingZPos;
+  double zPos;
+  double kRatio;
+};
+
+class ZConsParaData : public GenericData{
+	
+  public:  	
+    ZConsParaData();
+    void addItem(ZConsParaItem& item) {data.push_back(item);}
+    vector<ZConsParaItem>* getData() {return &data;}
+    void setData(vector<ZConsParaItem>& theData) {data = theData;}
+    void sortByIndex();
+    	
+  private:  	
+    vector<ZConsParaItem> data;
+  };
+
+class ZConsParaSortCriterion{
+  public:
+    bool operator ()(const ZConsParaItem& item1, const ZConsParaItem& item2){
+      return item1.zconsIndex < item2.zconsIndex;
+    }
+
+};
+
 #endif