Changeset 0c8056 for src/Actions

Timestamp:

Sep 19, 2013, 8:23:52 PM (12 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:

40ec38

Parents:

a6ceab

git-author:

Frederik Heber <heber@…> (08/16/13 12:56:15)

git-committer:

Frederik Heber <heber@…> (09/19/13 20:23:52)

Message:

Actions now get ptr to ActionRegistry in cstor.

• this is the last of the externally present getActionRegistry() calls.
• also changed: Calculation, ErrorAction, ManipulateAtomsProcess, MakroAction, MethodAction, Process, Reaction. Some of these had default of doRegister but are only used with false. We removed any default value in header if set to true. However, this will cause default behavior of false (as Action has default NULL for ActionRegistry ptr).
• purged some unnecessary ActionRegistry includes.

Location:

src/Actions

Files:

• Action.cpp (modified) (3 diffs)
• Action.hpp (modified) (3 diffs)
• Action_impl_pre.hpp (modified) (2 diffs)
• Action_impl_python.hpp (modified) (1 diff)
• AtomsCalculation_impl.hpp (modified) (1 diff)
• Calculation.hpp (modified) (2 diffs)
• Calculation_impl.hpp (modified) (1 diff)
• CommandAction/HelpRedistributeAction.cpp (modified) (1 diff)
• ErrorAction.cpp (modified) (1 diff)
• ErrorAction.hpp (modified) (1 diff)
• MakroAction.cpp (modified) (2 diffs)
• MakroAction.hpp (modified) (1 diff)
• MakroAction_impl_pre.hpp (modified) (1 diff)
• ManipulateAtomsProcess.cpp (modified) (1 diff)
• ManipulateAtomsProcess.hpp (modified) (1 diff)
• MethodAction.cpp (modified) (1 diff)
• MethodAction.hpp (modified) (2 diffs)
• Process.cpp (modified) (1 diff)
• Process.hpp (modified) (2 diffs)
• Reaction.hpp (modified) (1 diff)
• Reaction_impl.hpp (modified) (1 diff)
• Reaction_impl_pre.hpp (modified) (1 diff)
• unittests/ActionSequenceUnitTest.cpp (modified) (4 diffs)

src/Actions/Action.cpp

@@ -41 +41 @@
 #include "Actions/Action.hpp"
 #include "Actions/ActionExceptions.hpp"
-#include "Actions/ActionQueue.hpp"
 #include "Actions/ActionHistory.hpp"
+#include "Actions/ActionRegistry.hpp"
 #include "Actions/OptionRegistry.hpp"
 #include "Actions/OptionTrait.hpp"
@@ -75 +75 @@
 Action::state_ptr Action::failure;
 
-Action::Action(const ActionTrait &_Traits, bool _doRegister) :
-    Traits(_Traits)
+Action::Action(const ActionTrait &_Traits, ActionRegistry * const _AR) :
+    Traits(_Traits),
+    AR(_AR)
 {
   // register with ActionRegistry
-  if(_doRegister){
-    ActionQueue::getInstance().getActionRegistry().registerInstance(this);
+  if(AR != NULL) {
+    AR->registerInstance(this);
   }
 
@@ -128 +129 @@
 {
   // unregister us if still registered
-  if(ActionQueue::getInstance().isActionKnownByName(getName()))
-    if (ActionQueue::getInstance().getActionByName(getName()) == this)
-      ActionQueue::getInstance().getActionRegistry().unregisterInstance(this);
+  if (AR != NULL)
+    AR->unregisterInstance(this);
 
   for (ActionTrait::options_const_iterator optioniter = Traits.getBeginIter();

src/Actions/Action.hpp

@@ -28 +28 @@
 
 namespace MoleCuilder {
+  class ActionRegistry;
   class ActionState;
   class ActionSequence;
@@ -101 +102 @@
    *
    * \param Traits information class to this action
-   * \param _doRegister whether to register with ActionRegistry
-   */
-  Action(const ActionTrait &_Traits, bool _doRegister=true);
+   * \param _AR pointer to ActionRegistry to register, NULL - do not register
+   */
+  Action(const ActionTrait &_Traits, ActionRegistry * const _AR = NULL);
   virtual ~Action();
 
@@ -167 +168 @@
   const ActionTrait Traits;
 
+  /** Action is registered with an ActionRegistry and stores its pointer internally.
+   *
+   */
+  ActionRegistry* const AR;
+
 protected:
   /** Removes the static entities Action::success and Action::failure.

src/Actions/Action_impl_pre.hpp

@@ -187 +187 @@
 
 
-#include "Actions/ActionRegistry.hpp"
 //#include "Actions/ActionTraits.hpp"
 #include "UIElements/Dialog.hpp"
@@ -235 +234 @@
 // =========== constructor ===========
 ACTION::ACTION () :
-  Action(ActionTraits< ACTION >(), false)
+  Action(ActionTraits< ACTION >(), NULL)
 {}
 

src/Actions/Action_impl_python.hpp

@@ -101 +101 @@
 
 #include "Actions/Action.hpp"
-#include "Actions/ActionRegistry.hpp"
 
 namespace MoleCuilder {

src/Actions/AtomsCalculation_impl.hpp

@@ -22 +22 @@
 template<typename T>
 AtomsCalculation<T>::AtomsCalculation(boost::function<T(atom*)> _op,const ActionTrait &_trait,AtomDescriptor _descr) :
-  Calculation<std::vector<T> >(0,_trait,false),
+  Calculation<std::vector<T> >(0,_trait,NULL),
   descr(_descr),
   op(_op)

src/Actions/Calculation.hpp

@@ -14 +14 @@
 #endif
 
-
 #include "Actions/Process.hpp"
 
 namespace MoleCuilder {
+
+class ActionRegistry;
 
 /**
@@ -29 +30 @@
 {
 public:
-  Calculation(int _maxSteps, const ActionTrait &_trait, bool _doRegister=true);
+  Calculation(int _maxSteps, const ActionTrait &_trait, ActionRegistry * const _AR);
   virtual ~Calculation();
 

src/Actions/Calculation_impl.hpp

@@ -22 +22 @@
 
 template<typename T>
-Calculation<T>::Calculation(int _maxSteps, const ActionTrait &_trait, bool _doRegister) :
-  Process(_maxSteps,_trait,_doRegister),
+Calculation<T>::Calculation(int _maxSteps, const ActionTrait &_trait, ActionRegistry * const _AR) :
+  Process(_maxSteps,_trait,_AR),
   result(0),
   done(false)

src/Actions/CommandAction/HelpRedistributeAction.cpp

@@ -38 +38 @@
 #include <string>
 
-#include "Actions/ActionRegistry.hpp"
 #include "Actions/ActionTrait.hpp"
-#include "Actions/OptionRegistry.hpp"
 #include "Actions/OptionTrait.hpp"
 #include "CodePatterns/Log.hpp"

src/Actions/ErrorAction.cpp

@@ -44 +44 @@
 using namespace MoleCuilder;
 
-ErrorAction::ErrorAction(const ActionTrait &_trait,const char * _errorMsg,bool _doRegister) :
-Action(_trait,_doRegister),
+ErrorAction::ErrorAction(const ActionTrait &_trait,const char * _errorMsg, ActionRegistry * const _AR) :
+Action(_trait,_AR),
 errorMsg(_errorMsg)
 {

src/Actions/ErrorAction.hpp

@@ -23 +23 @@
 {
 public:
-  ErrorAction(const ActionTrait &_trait,const char * _errorMsg,bool _doRegister=true);
+  ErrorAction(const ActionTrait &_trait,const char * _errorMsg, ActionRegistry * const _AR);
   virtual ~ErrorAction();
 

src/Actions/MakroAction.cpp

@@ -41 +41 @@
 #include "Actions/Action.hpp"
 #include "Actions/ActionExceptions.hpp"
+#include "Actions/ActionRegistry.hpp"
 #include "Actions/ActionSequence.hpp"
 #include "CodePatterns/Assert.hpp"
@@ -60 +61 @@
 };
 
-MakroAction::MakroAction(const ActionTrait &_trait,ActionSequence& _actions,bool _doRegister) :
-Action(_trait,_doRegister),
+MakroAction::MakroAction(const ActionTrait &_trait,ActionSequence& _actions, ActionRegistry * const _AR) :
+Action(_trait,_AR),
 actions(_actions)
 {

src/Actions/MakroAction.hpp

@@ -31 +31 @@
 {
 public:
-  MakroAction(const ActionTrait &_trait,ActionSequence& _actions,bool _doRegister=true);
+  MakroAction(const ActionTrait &_trait,ActionSequence& _actions, ActionRegistry * const _AR=NULL);
   virtual ~MakroAction();
 

src/Actions/MakroAction_impl_pre.hpp

@@ -235 +235 @@
 // =========== constructor ===========
 ACTION::ACTION () :
-  MakroAction(ActionTraits< ACTION >(), actions, false)
+  MakroAction(ActionTraits< ACTION >(), actions, NULL)
 {}
 

src/Actions/ManipulateAtomsProcess.cpp

@@ -48 +48 @@
     AtomDescriptor _descr,
     const ActionTrait &_trait,
-    bool _doRegister) :
-  Process(0,_trait,_doRegister),
+    ActionRegistry * const _AR) :
+  Process(0,_trait,_AR),
   descr(_descr),
   operation(_operation)

src/Actions/ManipulateAtomsProcess.hpp

@@ -25 +25 @@
 namespace MoleCuilder {
 
+class ActionRegistry;
+
 class ManipulateAtomsProcess : public Process
 {
 public:
-  ManipulateAtomsProcess(boost::function<void(atom*)> _operation, AtomDescriptor descr,const ActionTrait &_trait,bool _doRegister=true);
+  ManipulateAtomsProcess(boost::function<void(atom*)> _operation, AtomDescriptor descr,const ActionTrait &_trait,ActionRegistry * const _AR);
   virtual ~ManipulateAtomsProcess();
 

src/Actions/MethodAction.cpp

@@ -44 +44 @@
 using namespace MoleCuilder;
 
-MethodAction::MethodAction(const ActionTrait &_trait,boost::function<void()> _executeMethod,bool _doRegister) :
-   Action(_trait,_doRegister),
+MethodAction::MethodAction(const ActionTrait &_trait,boost::function<void()> _executeMethod,ActionRegistry * const _AR) :
+   Action(_trait,_AR),
 executeMethod(_executeMethod)
 {

src/Actions/MethodAction.hpp

@@ -21 +21 @@
 namespace MoleCuilder {
 
+class ActionRegistry;
+
 /**
  * Wrapper class that allows the construction of Actions from any kind of Method
@@ -27 +29 @@
 {
 public:
-  MethodAction(const ActionTrait &_trait,boost::function<void()> _executeMethod,bool _doRegister=true);
+  MethodAction(const ActionTrait &_trait,boost::function<void()> _executeMethod,ActionRegistry * const _AR);
   virtual ~MethodAction();
   virtual bool canUndo();

src/Actions/Process.cpp

@@ -41 +41 @@
 using namespace MoleCuilder;
 
-Process::Process(int _maxSteps, const ActionTrait &_trait, bool _doRegister) :
-  Action(_trait,_doRegister),
+Process::Process(int _maxSteps, const ActionTrait &_trait, ActionRegistry * const _AR) :
+  Action(_trait,_AR),
   Observable("Process"),
   maxSteps(_maxSteps),

src/Actions/Process.hpp

@@ -28 +28 @@
 namespace MoleCuilder {
 
+class ActionRegistry;
+
 /**
  * A Process is an Action that might take some time and therefore has special
@@ -49 +51 @@
 {
 public:
-  Process(int _maxSteps, const ActionTrait &_trait, bool _doRegister=true);
+  Process(int _maxSteps, const ActionTrait &_trait, ActionRegistry * const _AR);
   virtual ~Process();
 

src/Actions/Reaction.hpp

@@ -30 +30 @@
 {
 public:
-  Reaction(const ActionTrait &_trait, bool _doRegister=true);
+  Reaction(const ActionTrait &_trait, ActionRegistry * const _AR=NULL);
   virtual ~Reaction();
 

src/Actions/Reaction_impl.hpp

@@ -23 +23 @@
 
 template<typename T>
-Reaction<T>::Reaction(const ActionTrait &_trait, bool _doRegister) :
-  Action(_trait,_doRegister),
+Reaction<T>::Reaction(const ActionTrait &_trait, ActionRegistry * const _AR) :
+  Action(_trait,_AR),
   result(0),
   done(false)

src/Actions/Reaction_impl_pre.hpp

@@ -163 +163 @@
 // =========== constructor ===========
 REACTION::REACTION () :
-  Reaction< RETURNTYPE >(ActionTraits< REACTION >(), false)
+  Reaction< RETURNTYPE >(ActionTraits< REACTION >(), NULL)
 {}
 

src/Actions/unittests/ActionSequenceUnitTest.cpp

@@ -63 +63 @@
 public:
   canUndoActionStub(const ActionTrait &_trait):
-    Action(_trait,false){}
+    Action(_trait,NULL){}
   virtual ~canUndoActionStub(){}
 
@@ -92 +92 @@
 public:
   cannotUndoActionStub(const ActionTrait &_trait) :
-    Action(_trait,false){}
+    Action(_trait,NULL){}
   virtual ~cannotUndoActionStub(){}
 
@@ -121 +121 @@
 public:
   wasCalledActionStub(const ActionTrait &_trait) :
-      Action(_trait,false),
+      Action(_trait,NULL),
       called(false)
   {}
@@ -278 +278 @@
 
   ActionTrait MakroTrait("Test MakroAction");
-  MakroAction act(MakroTrait,*sequence,false);
+  MakroAction act(MakroTrait,*sequence,NULL);
 
   act.call();