Changeset af5384 for src/Actions/ActionQueue.cpp

Timestamp:

Apr 29, 2014, 12:42:44 PM (11 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

7fc447

Parents:

36053c

git-author:

Frederik Heber <heber@…> (08/27/13 01:58:34)

git-committer:

Frederik Heber <heber@…> (04/29/14 12:42:44)

Message:

Actions can now clone() and split off prepare() from call().

• ActionQueue now separates call phase into clone(), prepare(), and call().
• ActionQueue's dstor releases Actions in deque.
• CurrentAction is an index as push_back always invalidates iterator.
• ActionQueue_t is now a simple vector of ptrs.
• call() is now non-interactive, (maybe) interactive part is placed in prepare() where dialogs are used to fill parameters.
• only fully prepared Actions are placed in ActionQueue.
• ActionQueue obtains action instances from Registry, copies, prepares them, and places them in the queue.
• Action::clone() gets QueryOptions as param. This lets us either clone without params or really copy the instance.
• If action is called as COMMAND, params have been filled already.
• Reactions require a ActionQueue::getLastAction() to actually obtain result of (cloned) Action.
• FIX: Calculation now has const has...() and getResult().

File:

• src/Actions/ActionQueue.cpp (modified) (2 diffs)

src/Actions/ActionQueue.cpp

@@ -53 +53 @@
 ActionQueue::ActionQueue() :
     AR(new ActionRegistry()),
-    history(new ActionHistory)
+    history(new ActionHistory),
+    CurrentAction(0)
 {}
 
 ActionQueue::~ActionQueue()
 {
-  queue.clear();
+  // free all actions contained in queue
+  for (ActionQueue_t::iterator iter = queue.begin(); !queue.empty(); iter = queue.begin()) {
+    delete *iter;
+    queue.erase(iter);
+  }
+
   delete history;
   delete AR;
@@ -65 +71 @@
 void ActionQueue::queueAction(const std::string &name, enum Action::QueryOptions state)
 {
-  Action* _action = AR->getActionByName(name);
-  queue.push_back(_action);
-  _action->call(state);
+  queueAction(AR->getActionByName(name), state);
 }
 
 void ActionQueue::queueAction(Action *_action, enum Action::QueryOptions state)
 {
-  queue.push_back(_action);
-  _action->call(state);
+  Action *newaction = _action->clone(state);
+  newaction->prepare(state);
+  queue.push_back( newaction );
+  newaction->call();
 }