Changeset e3ce0e for src/Actions/ActionSequence.cpp

Timestamp:

Jun 20, 2018, 8:20:43 AM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

AutomationFragmentation_failures, Candidate_v1.6.1, Candidate_v1.7.0, ChemicalSpaceEvaluator, Exclude_Hydrogens_annealWithBondGraph, ForceAnnealing_with_BondGraph_contraction-expansion, StoppableMakroAction, stable

Children:

4b2adf

Parents:

559293

git-author:

Frederik Heber <frederik.heber@…> (09/13/17 17:20:35)

git-committer:

Frederik Heber <frederik.heber@…> (06/20/18 08:20:43)

Message:

MakroAction allows getting the internal ActionSequence's current step.

File:

• src/Actions/ActionSequence.cpp (modified) (3 diffs)

src/Actions/ActionSequence.cpp

@@ -47 +47 @@
 
 ActionSequence::ActionSequence() :
-    loop(1)
+    loop(1),
+    step(0)
 {}
 
 ActionSequence::ActionSequence(const ActionSequence &_other) :
-    loop(1)
+    loop(1),
+    step(0)
 {
   // we need to override copy cstor as we have pointer referenced objects
@@ -114 +116 @@
 void ActionSequence::callAll()
 {
-  for (size_t i=0;i<loop;++i)
+  for (step=0;step<loop;++step)
     for(actionSet::iterator it=actions.begin(); it!=actions.end(); it++){
       // we want to have a global bookkeeping for all actions in the sequence, so
@@ -128 +130 @@
 {
   stateSet states;
-  for (size_t i=0;i<loop;++i)
+  for (step=0;step<loop;++step)
     for(actionSet::iterator it=actions.begin(); it!=actions.end(); it++){
       // we want to have a global bookkeeping for all actions in the sequence, so