Changeset 7fc447 for src/Actions

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:

d9f2b3

Parents:

af5384

git-author:

Frederik Heber <heber@…> (08/28/13 22:08:39)

git-committer:

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

Message:

Renamed ActionsQueue's queue -> actionqueue.

Location:

src/Actions

Files:

• ActionQueue.cpp (modified) (4 diffs)
• ActionQueue.hpp (modified) (6 diffs)

src/Actions/ActionQueue.cpp

@@ -59 +59 @@
 ActionQueue::~ActionQueue()
 {
-  // free all actions contained in queue
-  for (ActionQueue_t::iterator iter = queue.begin(); !queue.empty(); iter = queue.begin()) {
+  // free all actions contained in actionqueue
+  for (ActionQueue_t::iterator iter = actionqueue.begin(); !actionqueue.empty(); iter = actionqueue.begin()) {
     delete *iter;
-    queue.erase(iter);
+    actionqueue.erase(iter);
   }
 
@@ -78 +78 @@
   Action *newaction = _action->clone(state);
   newaction->prepare(state);
-  queue.push_back( newaction );
+  actionqueue.push_back( newaction );
   newaction->call();
 }
@@ -99 +99 @@
 void ActionQueue::outputAsCLI(std::ostream &output) const
 {
-  for (ActionQueue_t::const_iterator iter = queue.begin();
-      iter != queue.end();
+  for (ActionQueue_t::const_iterator iter = actionqueue.begin();
+      iter != actionqueue.end();
       ++iter) {
     // skip store-session in printed list
     if ( ((*iter)->getName() != std::string("store-session"))
         && ((*iter)->getName() != std::string("load-session"))) {
-      if (iter != queue.begin())
+      if (iter != actionqueue.begin())
         output << " ";
       (*iter)->outputAsCLI(output);
@@ -118 +118 @@
   output << "import " << prefix << std::endl;
   output << "# ========================== Stored Session BEGIN ==========================" << std::endl;
-  for (ActionQueue_t::const_iterator iter = queue.begin();
-      iter != queue.end();
+  for (ActionQueue_t::const_iterator iter = actionqueue.begin();
+      iter != actionqueue.end();
       ++iter) {
     // skip store-session in printed list

src/Actions/ActionQueue.hpp

@@ -41 +41 @@
   /** Queues the Action with \a name to be called.
    *
-   * \param name token of Action to queue
+   * \param name token of Action to actionqueue
    * \param state whether Actions needs to be filled via a Dialog or not
    */
@@ -55 +55 @@
   /** Returns the spawned action by token \a name.
    *
-   * Action is checked into internal queue.
+   * Action is checked into internal actionqueue.
    *
    * \return pointer to newly spawned action
@@ -87 +87 @@
   const ActionTrait& getActionsTrait(const std::string &name) const;
 
-  /** Print the current contents of the queue as CLI instantiated list of Actions.
+  /** Print the current contents of the actionqueue as CLI instantiated list of Actions.
    *
    * This is useful for storing the current session.
@@ -95 +95 @@
   void outputAsCLI(std::ostream &output) const;
 
-  /** Print the current contents of the queue as Python instantiated list of Actions.
+  /** Print the current contents of the actionqueue as Python instantiated list of Actions.
    *
    * This is useful for storing the current session.
@@ -121 +121 @@
    */
   const Action &getLastAction() const {
-    return *(queue.back());
+    return *(actionqueue.back());
   }
 
@@ -159 +159 @@
   ActionHistory *history;
 
-  //!> internal queue of actions
-  ActionQueue_t queue;
+  //!> internal actionqueue of actions
+  ActionQueue_t actionqueue;
 
-  //!> point to current action in queue
+  //!> point to current action in actionqueue
   size_t CurrentAction;
 };