Changeset 10b1ef for src/Actions/MoleculeAction/ForceAnnealingAction.def

Timestamp:

Nov 7, 2017, 7:34:56 AM (7 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_with_BondGraph_continued_betteresults

Children:

03d40df

Parents:

38ac25

git-author:

Frederik Heber <frederik.heber@…> (11/04/17 10:00:15)

git-committer:

Frederik Heber <frederik.heber@…> (11/07/17 07:34:56)

Message:

ForceAnnealingAction's Undo removes trajectory item if it was added.

• before Undo would not truly undo the change to the trajectory. Now, we additionally store the trajectory size and may recogniye thereby whether we added a step or not. Note that stepping the world time does not add to the trajectory, as it uses the last present map element closest to the current time step.
• TESTFIX: XFAIL removed from Undo as it is now working. Extended Undo test to cover both cases (ForceAnnealing added new step and did not add new step).

File:

• src/Actions/MoleculeAction/ForceAnnealingAction.def (modified) (1 diff)

src/Actions/MoleculeAction/ForceAnnealingAction.def

@@ -32 +32 @@
 (DummyValidator<bool>())
 
-#define statetypes (std::vector< std::vector<AtomicInfo> >)(std::vector< std::vector<AtomicInfo> >)
-#define statereferences (UndoInfo)(RedoInfo)
+#define statetypes (std::vector< std::vector<AtomicInfo> >)(std::vector<int>)(std::vector< std::vector<AtomicInfo> >)
+#define statereferences (UndoInfo)(UndoTrajectorySize)(RedoInfo)
 
 // some defines for all the names, you may use ACTION, STATE and PARAMS