Changeset c8165c for src/Actions/WorldAction/StepWorldTimeAction.cpp

Timestamp:

May 8, 2017, 2:01:48 PM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_goodresults, ForceAnnealing_tocheck

Children:

db0833

Parents:

73faf4 (diff), c1446cd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'Docu_Python_wait' into Candidate_v1.6.1

Conflicts:

tests/Python/AllActions/options.dat

• two options introduced at same place, both get in.

File:

• src/Actions/WorldAction/StepWorldTimeAction.cpp (modified) (3 diffs)

src/Actions/WorldAction/StepWorldTimeAction.cpp

@@ -47 +47 @@
 using namespace MoleCuilder;
 
-// if both are given, we use backwards
-static int getSteps(const unsigned int _forward, const unsigned int _backward)
-{
-  int steps = 0;
-  if (_backward > 0)
-    steps = -_backward;
-  else
-    steps = _forward;
-
-  return steps;
-}
-
 // and construct the stuff
 #include "StepWorldTimeAction.def"
@@ -69 +57 @@
   WorldStepWorldTimeState *UndoState = new WorldStepWorldTimeState(oldtime, params);
 
-  const int steps = getSteps(params.steps_forward.get(), params.steps_backward.get());
-
-  if ((oldtime + steps) < 0) {
+  if ((oldtime + params.steps.get()) < 0) {
     ELOG(1, "Cannot step back before time step #0.");
     delete UndoState;
     return Action::failure;
   }
-  World::getInstance().setTime(oldtime+steps);
+  World::getInstance().setTime(oldtime+params.steps.get());
   LOG(0, "Current time step is now: " << WorldTime::getTime() << ".");
   return ActionState::ptr(UndoState);
@@ -93 +79 @@
   WorldStepWorldTimeState *state = assert_cast<WorldStepWorldTimeState*>(_state.get());
 
-  const int steps = getSteps(
-      state->params.steps_forward.get(),
-      state->params.steps_backward.get());
-
-  World::getInstance().setTime(state->oldtime+steps);
+  World::getInstance().setTime(state->oldtime+state->params.steps.get());
   LOG(0, "Current time step is now: " << WorldTime::getTime() << ".");