--- branches/new_design/OOPSE-3.0/src/io/ZConsReader.hpp	2004/12/01 19:32:45	1817
+++ branches/new_design/OOPSE-3.0/src/io/ZConsReader.hpp	2004/12/01 20:05:49	1818
@@ -5,11 +5,14 @@
 #include <string>
 #include <vector>
 
-#include "integrators/Integrator.hpp"
 #include "brains/SimInfo.hpp"
 
-using namespace std;
+namespace oopse {
 
+/**
+ * @class ZConsReader
+ * @todo document
+ */
 class ZConsReader{
   public:
     
@@ -21,28 +24,30 @@ class ZConsReader{
     void readNextFrame();
     bool hasNextFrame();
     int getNumZMol();
-    vector<int> getZConsIndex();
-    vector<double> getZConsPos();
+    std::vector<int> getZConsIndex();
+    std::vector<double> getZConsPos();
     //vector<double> getKRatio();
     
-    vector<double> getCurZPos(); 
-    vector<double> getCurFZ();
+    std::vector<double> getCurZPos(); 
+    std::vector<double> getCurFZ();
     double getCurTime();
 
   private:
+    
     ifstream* istream;    
     SimInfo* info;
-    string zconsFileName;
+    std::string zconsFileName;
 
     int nZMol;
-    vector<int> index;
-    vector<double> zconsPos;
+    std::vector<int> index;
+    std::vector<double> zconsPos;
     //vector<double> kRatio;
 
     double curTime;    
-    vector<double> curFZ;
-    vector<double> curZPos;
+    std::vector<double> curFZ;
+    std::vector<double> curZPos;
 
 };
 
+}
 #endif