Bug fix. Multitraj iterator had sync issues with Trajectory class res…

…ulting in skipped first frame and duplicated final frame.
GrossfieldLab · Aug 7, 2018 · 3b91e67 · 3b91e67
1 parent bf37cbe
commit 3b91e67
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/MultiTraj.cpp b/src/MultiTraj.cpp
@@ -71,7 +71,7 @@ namespace loos {
 	}
 
 	bool MultiTrajectory::parseFrame() {
-		if (eof())
+		if (eof() || atEnd())
 			return 0;
 		return(_trajectories[_curtraj]->readFrame(_curframe));
 	}
@@ -96,4 +96,3 @@ namespace loos {
 	}
 
 }
-
diff --git a/src/MultiTraj.hpp b/src/MultiTraj.hpp
@@ -45,23 +45,24 @@ namespace loos {
 
 		MultiTrajectory()
 			: _nframes(0), _skip(0), _stride(1), _curtraj(0), _curframe(0)
-		{ }
+		{ cached_first = true; }
 
 		//! instantiate a new empty MultiTrajectory
 		MultiTrajectory(const AtomicGroup& model)
 			: _nframes(0), _skip(0), _stride(1), _curtraj(0), _curframe(0), _model(model)
-		{ }
+		{ cached_first = true; }
 
 		MultiTrajectory(const AtomicGroup& model, const uint skip, const uint stride)
 			: _nframes(0), _skip(skip), _stride(stride), _curtraj(0), _curframe(0), _model(model)
-		{ }
+		{ cached_first = true; }
 
 
 		//! Instantiate a new MultiTrajectory using the passed filenames
 		MultiTrajectory(const std::vector<std::string>& filenames,
 						const AtomicGroup& model)
 			: _nframes(0), _skip(0), _stride(1), _curtraj(0), _curframe(0), _model(model)
 		{
+			cached_first = true;
 			initWithList(filenames, model);
 		}
 
@@ -72,6 +73,7 @@ namespace loos {
 						const uint stride)
 			: _nframes(0), _skip(skip), _stride(stride), _curtraj(0), _curframe(skip), _model(model)
 		{
+			cached_first = true;
 			initWithList(filenames, model);
 		}