--- branches/new_design/OOPSE-3.0/src/io/ZConsReader.cpp	2005/01/07 21:50:13	1910
+++ branches/new_design/OOPSE-3.0/src/io/ZConsReader.cpp	2005/01/10 18:05:45	1911
@@ -1,185 +1,67 @@
-#include "constraints/ZconsData.hpp"
 #include "io/ZConsReader.hpp"
 #include "utils/simError.h"
+#include "utils/StringUtils.hpp"
 namespace oopse {
 
-ZConsReader::ZConsReader(SimInfo* info)
-                   :istream(NULL){
+ZConsReader::ZConsReader(SimInfo* info) : info_(info){
 
-  GenericData* data;
-  StringGenericData* filename; 
-  this->info = info;
+    std::string zconsFileName_ = getPrefix(info_->getFinalConfigFileName()) + ".fz";
+    istream_.open(zconsFileName_.c_str());
 
- //retrieve output filename of z force
-  data = info->getPropertyByName(ZCONSFILENAME_ID);
-  if(!data) {
-
-      
-    sprintf( painCave.errMsg,
-               "ZConsReader error: If you use an ZConstraint\n"
-               " , you must set output filename of z-force.\n");
-    painCave.isFatal = 1;
-    simError();  
-
-  }
-  else{
-
-    filename = dynamic_cast<StringGenericData*>(data);
-    
-    if(!filename){
-
-      sprintf( painCave.errMsg,
-                 "ZConsReader error: Can not get property from SimInfo\n");
-      painCave.isFatal = 1;
-      simError();  
-        
+    if (!istream_){
+        std::cerr << "open " << zconsFileName_ << "error" << std::endl;
+        exit(1);
     }
-    else{
-      zconsFileName = filename->getData();
-    }
-    
-  }
 
-  istream = new std::ifstream(zconsFileName.c_str());
-
-  if (!istream){
-    std::cerr << "open " << filename << "error" << std::endl;
-    exit(1);
-  }
-  
-  readHeader();  
+    Globals* simParam = info_->getSimParams();
+    int nZconstraints = simParam->getNzConstraints();
+    ZconStamp** stamp = simParam->getZconStamp();
+    for (int i = 0; i < nZconstraints; i++){
+        allZmols_.push_back(stamp[i]->getMolIndex());
+    } 
 }
 
-ZConsReader::ZConsReader(const std::string& filename){
-  istream = new std::ifstream(zconsFileName.c_str());
-
-  if (!istream){
-    std::cerr << "open " << filename << "error" << std::endl;
-    exit(1);
-  }
-  
-  readHeader();  
-}
-
 ZConsReader::~ZConsReader(){
-  istream->close();
+  istream_.close();
 }
 
-int ZConsReader::getNumZMol(){
-  return nZMol;
-}
+void ZConsReader::readNextFrame(){
+    char line[MAXBUFFERSIZE];  
+    int nFixedZmol;
+    int sscanfCount;
 
- std::vector<int> ZConsReader::getZConsIndex(){
-  return index;
-}
+    fixedZmolData_.clear();
 
- std::vector<double> ZConsReader::getZConsPos(){
-  return zconsPos;
-}
+    istream_.getline(line, MAXBUFFERSIZE);
+    sscanfCount = sscanf(line, "%lf", &curTime_);
+    if (sscanfCount != 1){
+        std::cerr << "ZConsReader Error : reading file error" << std::endl;
+        exit(1);
+    }
 
-//double ZConsReader::getKRatio(){
-//  return kRatio;
-//}
-    
-double ZConsReader::getCurTime(){
-  return curTime;
-}
-
-std::vector<double> ZConsReader::getCurZPos(){
-  return curZPos;
-}
-
-std::vector<double> ZConsReader::getCurFZ(){
-  return curFZ;
-}
-
-void ZConsReader::readHeader(){
-  const int MAXBUFFERSIZE = 2000;
-  char line[MAXBUFFERSIZE];
-  int zmolIndex;
-  float zmolPos;
-  int sscanfCount;
-  
-  istream->getline(line, MAXBUFFERSIZE);
-
-  //skip the comment lines
-  while(line[0] == '#')
-      istream->getline(line, MAXBUFFERSIZE);
-
-  sscanfCount = sscanf(line, "%d", &nZMol);
-
-  if (sscanfCount != 1){
-    std::cerr << "ZConsReader Error : reading file error" << std::endl;
-    exit(1);
-  }
-  
-  for(int i = 0 ; i < nZMol; i++){
-
-    istream->getline(line, MAXBUFFERSIZE);
-      
-    sscanfCount = sscanf(line, "%d\t%f", &zmolIndex, &zmolPos);
-    if (sscanfCount != 2){
-      std::cerr << "ZConsReader Error : reading file error" << std::endl;
-      exit(1);    
+    istream_.getline(line, MAXBUFFERSIZE);
+    sscanfCount = sscanf(line, "%d", &nFixedZmol);
+    if (sscanfCount != 1){
+        std::cerr << "ZConsReader Error : reading file error" << std::endl;
+        exit(1);
     }
-    
-    index.push_back(zmolIndex);
-    zconsPos.push_back(zmolPos);
-  }
 
-  curZPos.resize(nZMol);
-  curFZ.resize(nZMol);
-}
+    ZconsData data;
+    for(int i = 0; i < nFixedZmol; i++){
+        istream_.getline(line, MAXBUFFERSIZE);
+        sscanfCount = sscanf(line, "%d\t%lf\t%lf\t%lf", &data.zmolIndex, &data.zforce, &data.zpos,&data.zconsPos);
+        if (sscanfCount != 4){
+          std::cerr << "ZConsReader Error : reading file error" << std::endl;
+          exit(1);
+        }
 
-void ZConsReader::readNextFrame(){
-  const int MAXBUFFERSIZE = 2000;
-  char line[MAXBUFFERSIZE];  
-  int tempNZMol;
-  int sscanfCount;
-  int tempIndex;
-  float tempCurTime;
-  float tempFZ;
-  float tempCurZPos;
-  float tempZconsPos;
-  
-  istream->getline(line, MAXBUFFERSIZE);
-  sscanfCount = sscanf(line, "%f", &tempCurTime);
-  if (sscanfCount != 1){
-    std::cerr << "ZConsReader Error : reading file error" << std::endl;
-    exit(1);
-  }
-  curTime = tempCurTime;
-  
-  istream->getline(line, MAXBUFFERSIZE);
-  sscanfCount = sscanf(line, "%d", &tempNZMol);
-  if (sscanfCount != 1){
-    std::cerr << "ZConsReader Error : reading file error" << std::endl;
-    exit(1);
-  }
-  
-  if (tempNZMol != nZMol){
-    std::cerr << "ZConsReader Error: reading file error" << std::endl;
-    exit(1);
-  }
-
-  for(int i = 0; i < nZMol; i++){
-    istream->getline(line, MAXBUFFERSIZE);
-    sscanfCount = sscanf(line, "%d\t%f\t%f\t%f", &tempIndex, &tempFZ, &tempCurZPos,&tempZconsPos);
-    if (sscanfCount != 4){
-      std::cerr << "ZConsReader Error : reading file error" << std::endl;
-      exit(1);
+        fixedZmolData_.push_back(data);
     }
 
-    index[i] = tempIndex;
-    curFZ[i] = tempFZ;
-    curZPos[i]= tempCurZPos;
-    zconsPos[i] = tempZconsPos;
-  }
-
 }
 
 bool ZConsReader::hasNextFrame(){
-  return istream->peek() != EOF ? true : false;
+  return istream_.peek() != EOF ? true : false;
 }
 
 }