[ViewVC] Diff of: group/branches/new_design/OOPSE-3.0/src/io/ZConsReader.cpp

Comparing branches/new_design/OOPSE-3.0/src/io/ZConsReader.cpp (file contents):
Revision 1701 by tim, Wed Nov 3 16:08:43 2004 UTC vs.
Revision 1818 by tim, Wed Dec 1 20:05:49 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 48 \| Line 50 \| ZConsReader::ZConsReader(const string& filename){
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){
#	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 181 \| Line 183 \| bool ZConsReader::hasNextFrame(){
183		return istream->peek() != EOF ? true : false;
184		}
185
186	+	}

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