ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/branches/new_design/OOPSE-3.0/src/io/ZConsReader.cpp
(Generate patch)

Comparing:
trunk/OOPSE-3.0/src/io/ZConsReader.cpp (file contents), Revision 1625 by tim, Thu Oct 21 16:22:01 2004 UTC vs.
branches/new_design/OOPSE-3.0/src/io/ZConsReader.cpp (file contents), Revision 1830 by tim, Thu Dec 2 05:17:10 2004 UTC

# Line 1 | Line 1
1 + #include "constraints/ZconsData.hpp"
2   #include "io/ZConsReader.hpp"
3   #include "utils/simError.h"
4 + namespace oopse {
5  
6   ZConsReader::ZConsReader(SimInfo* info)
7                     :istream(NULL){
# Line 9 | Line 11 | ZConsReader::ZConsReader(SimInfo* info)
11    this->info = info;
12  
13   //retrieve output filename of z force
14 <  data = info->getProperty(ZCONSFILENAME_ID);
14 >  data = info->getPropertyByName(ZCONSFILENAME_ID);
15    if(!data) {
16  
17        
# Line 41 | Line 43 | ZConsReader::ZConsReader(SimInfo* info)
43    istream = new ifstream(zconsFileName.c_str());
44  
45    if (!istream){
46 <    cerr << "open " << filename << "error" << endl;
46 >    std::cerr << "open " << filename << "error" << std::endl;
47      exit(1);
48    }
49    
50    readHeader();  
51   }
52  
53 < ZConsReader::ZConsReader(const string& filename){
53 > ZConsReader::ZConsReader(const std::string& filename){
54    istream = new ifstream(zconsFileName.c_str());
55  
56    if (!istream){
57 <    cerr << "open " << filename << "error" << endl;
57 >    std::cerr << "open " << filename << "error" << std::endl;
58      exit(1);
59    }
60    
# Line 67 | Line 69 | vector<int> ZConsReader::getZConsIndex(){
69    return nZMol;
70   }
71  
72 < vector<int> ZConsReader::getZConsIndex(){
72 > std::vector<int> ZConsReader::getZConsIndex(){
73    return index;
74   }
75  
76 < vector<double> ZConsReader::getZConsPos(){
76 > std::vector<double> ZConsReader::getZConsPos(){
77    return zconsPos;
78   }
79  
# Line 83 | Line 85 | vector<double> ZConsReader::getCurZPos(){
85    return curTime;
86   }
87  
88 < vector<double> ZConsReader::getCurZPos(){
88 > std::vector<double> ZConsReader::getCurZPos(){
89    return curZPos;
90   }
91  
92 < vector<double> ZConsReader::getCurFZ(){
92 > std::vector<double> ZConsReader::getCurFZ(){
93    return curFZ;
94   }
95  
# Line 100 | Line 102 | void ZConsReader::readHeader(){
102    
103    istream->getline(line, MAXBUFFERSIZE);
104  
105 <  cout << line << endl;
105 >  cout << line << std::endl;
106    //skip the comment lines
107    while(line[0] == '#')
108        istream->getline(line, MAXBUFFERSIZE);
# Line 108 | Line 110 | void ZConsReader::readHeader(){
110    sscanfCount = sscanf(line, "%d", &nZMol);
111  
112    if (sscanfCount != 1){
113 <    cerr << "ZConsReader Error : reading file error" << endl;
113 >    std::cerr << "ZConsReader Error : reading file error" << std::endl;
114      exit(1);
115    }
116    
# Line 118 | Line 120 | void ZConsReader::readHeader(){
120        
121      sscanfCount = sscanf(line, "%d\t%f", &zmolIndex, &zmolPos);
122      if (sscanfCount != 2){
123 <      cerr << "ZConsReader Error : reading file error" << endl;
123 >      std::cerr << "ZConsReader Error : reading file error" << std::endl;
124        exit(1);    
125      }
126      
# Line 144 | Line 146 | void ZConsReader::readNextFrame(){
146    istream->getline(line, MAXBUFFERSIZE);
147    sscanfCount = sscanf(line, "%f", &tempCurTime);
148    if (sscanfCount != 1){
149 <    cerr << "ZConsReader Error : reading file error" << endl;
149 >    std::cerr << "ZConsReader Error : reading file error" << std::endl;
150      exit(1);
151    }
152    curTime = tempCurTime;
# Line 152 | Line 154 | void ZConsReader::readNextFrame(){
154    istream->getline(line, MAXBUFFERSIZE);
155    sscanfCount = sscanf(line, "%d", &tempNZMol);
156    if (sscanfCount != 1){
157 <    cerr << "ZConsReader Error : reading file error" << endl;
157 >    std::cerr << "ZConsReader Error : reading file error" << std::endl;
158      exit(1);
159    }
160    
161    if (tempNZMol != nZMol){
162 <    cerr << "ZConsReader Error: reading file error" << endl;
162 >    std::cerr << "ZConsReader Error: reading file error" << std::endl;
163      exit(1);
164    }
165  
# Line 165 | Line 167 | void ZConsReader::readNextFrame(){
167      istream->getline(line, MAXBUFFERSIZE);
168      sscanfCount = sscanf(line, "%d\t%f\t%f\t%f", &tempIndex, &tempFZ, &tempCurZPos,&tempZconsPos);
169      if (sscanfCount != 4){
170 <      cerr << "ZConsReader Error : reading file error" << endl;
170 >      std::cerr << "ZConsReader Error : reading file error" << std::endl;
171        exit(1);
172      }
173  
# Line 181 | Line 183 | bool ZConsReader::hasNextFrame(){
183    return istream->peek() != EOF ? true : false;
184   }
185  
186 + }

Diff Legend

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