Changeset 05a2c5 for src/World.cpp

Timestamp:

May 8, 2017, 2:00:10 PM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_goodresults, ForceAnnealing_tocheck

Children:

c1446cd

Parents:

f97bcc

git-author:

Frederik Heber <heber@…> (03/23/17 17:11:47)

git-committer:

Frederik Heber <frederik.heber@…> (05/08/17 14:00:10)

Message:

FIX: Fixing the use of the trajectories that were changed to maps.

• as the atom's trajectories are now stored inside a map, i.e. not every step necessarily needs to be present, there will still some places in the code that were meant for the old vector storing.
• Atom::UpdateStep() updates the current step, not the future step.
• AtomInfo::append/removeTrajectoryStep() now no longer ASSERT that the step is not the current one. Due to the trajectory in map concept (with current it simply sought by lower_bound()) this is no longer necessary.
• HydrogenPool no longer adds all trajectory steps till current time.
• World has commented out code for also copying the current atom positions in case a new time step is added, but this is not used as so far we do not recognize whether it is a new time step ... and also it is not really necessary.

File:

• src/World.cpp (modified) (4 diffs)

src/World.cpp

@@ -221 +221 @@
 }
 
-bool areBondsPresent(const unsigned int _step)
+static bool areBondsPresent(const unsigned int _step)
 {
   bool status = false;
@@ -229 +229 @@
     const atom * const Walker = *iter;
     status |= !Walker->getListOfBondsAtStep(_step).empty();
+  }
+
+  return status;
+}
+
+static bool areAtomsPresent(const unsigned int _step)
+{
+  bool status = false;
+
+  for (World::AtomConstIterator iter = const_cast<const World &>(World::getInstance()).getAtomIter();
+      (!status) && (iter != const_cast<const World &>(World::getInstance()).atomEnd()); ++iter) {
+    const atom * const Walker = *iter;
+    status |= (Walker->getTrajectorySize() >= _step);
   }
 
@@ -259 +272 @@
 }
 
-static void copyAtoms(const unsigned int _srcstep, const unsigned int _deststep)
-{
-  for (World::AtomIterator iter = World::getInstance().getAtomIter();
-      iter != World::getInstance().atomEnd(); ++iter) {
-    atom * const Walker = *iter;
-    Walker->UpdateStep(_deststep);
-    Walker->setPositionAtStep(_deststep, Walker->getPositionAtStep(_srcstep));
-    Walker->setAtomicVelocityAtStep(_deststep, Walker->getAtomicVelocityAtStep(_srcstep));
-    Walker->setAtomicForceAtStep(_deststep, Walker->getAtomicForceAtStep(_srcstep));
-  }
-}
+//static void copyAtoms(const unsigned int _srcstep, const unsigned int _deststep)
+//{
+//  for (World::AtomIterator iter = World::getInstance().getAtomIter();
+//      iter != World::getInstance().atomEnd(); ++iter) {
+//    atom * const Walker = *iter;
+//    Walker->UpdateStep(_deststep);
+//    Walker->setPositionAtStep(_deststep, Walker->getPositionAtStep(_srcstep));
+//    Walker->setAtomicVelocityAtStep(_deststep, Walker->getAtomicVelocityAtStep(_srcstep));
+//    Walker->setAtomicForceAtStep(_deststep, Walker->getAtomicForceAtStep(_srcstep));
+//  }
+//}
 
 void World::setTime(const unsigned int _step)
@@ -276 +289 @@
     const unsigned int oldstep = WorldTime::getTime();
 
-    copyAtoms(oldstep, _step);
+//    if (!areAtomsPresent(_step))
+//      copyAtoms(oldstep, _step);
+
     // 1. copy bond graph (such not each addBond causes GUI update)
     if (!areBondsPresent(_step)) {