Changeset 628577 for src/Actions

Timestamp:

Sep 19, 2013, 8:23:51 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, Candidate_v1.7.0, 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:

1d3563

Parents:

732507

git-author:

Frederik Heber <heber@…> (08/16/13 10:32:17)

git-committer:

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

Message:

Introduced ActionQueue which contains internal ActionRegistry.

• ActionQueue inherits ActionRegistry' singleton status.
• replaced all occurrences of AR::getInstance() by wrapper through AQ.

Location:

src/Actions

Files:

• Action.cpp (modified) (3 diffs)
• ActionQueue.cpp (added)
• ActionQueue.hpp (added)
• ActionRegistry.cpp (modified) (2 diffs)
• ActionRegistry.hpp (modified) (4 diffs)
• Action_impl_pre.hpp (modified) (3 diffs)
• CommandAction/HelpAction.cpp (modified) (3 diffs)
• FragmentationAction/MolecularDynamicsAction.cpp (modified) (2 diffs)
• GraphAction/SubgraphDissectionAction.cpp (modified) (3 diffs)
• Makefile.am (modified) (2 diffs)
• MakroAction_impl_pre.hpp (modified) (3 diffs)
• OptionRegistry.cpp (modified) (3 diffs)
• Reaction_impl_pre.hpp (modified) (3 diffs)
• pyMoleCuilder.cpp (modified) (1 diff)
• unittests/ActionRegistryUnitTest.cpp (modified) (4 diffs)
• unittests/ActionRegistryUnitTest.hpp (modified) (2 diffs)
• unittests/ActionSequenceUnitTest.cpp (modified) (2 diffs)
• unittests/AtomsCalculationUnitTest.cpp (modified) (2 diffs)
• unittests/ManipulateAtomsUnitTest.cpp (modified) (2 diffs)

src/Actions/Action.cpp

@@ -41 +41 @@
 #include "Actions/Action.hpp"
 #include "Actions/ActionExceptions.hpp"
-#include "Actions/ActionRegistry.hpp"
+#include "Actions/ActionQueue.hpp"
 #include "Actions/ActionHistory.hpp"
 #include "Actions/OptionRegistry.hpp"
@@ -80 +80 @@
   // register with ActionRegistry
   if(_doRegister){
-    ActionRegistry::getInstance().registerInstance(this);
+    ActionQueue::getInstance().getActionRegistry().registerInstance(this);
   }
 
@@ -128 +128 @@
 {
   // unregister us if still registered
-  if(ActionRegistry::getInstance().isActionPresentByName(getName()))
-    if (ActionRegistry::getInstance().getActionByName(getName()) == this)
-      ActionRegistry::getInstance().unregisterInstance(this);
+  if(ActionQueue::getInstance().getActionRegistry().isActionPresentByName(getName()))
+    if (ActionQueue::getInstance().getActionRegistry().getActionByName(getName()) == this)
+      ActionQueue::getInstance().getActionRegistry().unregisterInstance(this);
 
   for (ActionTrait::options_const_iterator optioniter = Traits.getBeginIter();

src/Actions/ActionRegistry.cpp

@@ -39 +39 @@
 
 #include "Actions/ActionRegistry.hpp"
-#include "CodePatterns/Singleton_impl.hpp"
 #include "CodePatterns/Registry_impl.hpp"
 
@@ -164 +163 @@
 
 
-CONSTRUCT_SINGLETON(ActionRegistry)
 CONSTRUCT_REGISTRY(Action)

src/Actions/ActionRegistry.hpp

@@ -20 +20 @@
 
 #include "CodePatterns/Registry.hpp"
-#include "CodePatterns/Singleton.hpp"
 #include "Actions/Action.hpp"
 
@@ -28 +27 @@
  *
  * The Action registry is a storage for any Action instance to retrieved by name.
- * It is a singleton and can be called from anywhere.
+ * ActionRegistry belongs to the ActionQueue.
  *
  * ActionRegistry::fillRegistry() is the essential function, called in the cstor,
@@ -38 +37 @@
  *
  */
-class ActionRegistry : public Singleton<ActionRegistry>, public Registry<Action>
+class ActionRegistry : public Registry<Action>
 {
-  friend class Singleton<ActionRegistry>;
   //friend class Registry<Action>;
 
@@ -55 +53 @@
   { return completely_instatiated; }
 
-private:
   ActionRegistry();
   ~ActionRegistry();
 
+private:
   void fillRegistry();
 

src/Actions/Action_impl_pre.hpp

@@ -50 +50 @@
 #include <boost/preprocessor/seq/transform.hpp>
 
+#include "Actions/ActionQueue.hpp"
 #include "Parameters/Parameter.hpp"
 
@@ -289 +290 @@
 )
 {
-  ACTION *ToCall = dynamic_cast<ACTION*>(ActionRegistry::getInstance().getActionByName( TOKEN )); //->clone(params);
+  ACTION *ToCall = dynamic_cast<ACTION*>(ActionQueue::getInstance().getActionRegistry().getActionByName( TOKEN )); //->clone(params);
   //ACTION::PARAMS params;
 #if defined paramreferences && BOOST_PP_NOT_EQUAL(MAXPARAMTYPES,0)
@@ -306 +307 @@
 #endif
         ) {
-  ACTION *ToCall = dynamic_cast<ACTION*>(ActionRegistry::getInstance().getActionByName( TOKEN )); //->clone(params);
+  ACTION *ToCall = dynamic_cast<ACTION*>(ActionQueue::getInstance().getActionRegistry().getActionByName( TOKEN )); //->clone(params);
   //ACTION::PARAMS params;
 #if defined paramtypes && defined paramtypes && BOOST_PP_NOT_EQUAL(MAXPARAMTYPES,0)

src/Actions/CommandAction/HelpAction.cpp

@@ -38 +38 @@
 #include <string>
 
-#include "Actions/ActionRegistry.hpp"
+#include "Actions/ActionQueue.hpp"
 #include "Actions/ActionTrait.hpp"
 #include "Actions/OptionRegistry.hpp"
@@ -78 +78 @@
   std::cout << std::endl;
   // print list of actions or its options
+  ActionRegistry &AR = ActionQueue::getInstance().getActionRegistry();
   if (params.actionname.get() == std::string("none")) {
     // print list of all Actions
     std::cout << "Here is a list of all available Actions:" << std::endl;
-    for(ActionRegistry::const_iterator iter = ActionRegistry::getInstance().getBeginIter();
-        iter != ActionRegistry::getInstance().getEndIter();
+    for(ActionRegistry::const_iterator iter = AR.getBeginIter();
+        iter != AR.getEndIter();
         ++iter) {
       const Action *instance = iter->second;
@@ -90 +91 @@
   } else {
     // retrieve command from Registry and print its help
-    if (ActionRegistry::getInstance().isActionPresentByName(params.actionname.get())) {
-      const Action *instance = ActionRegistry::getInstance().getActionByName(params.actionname.get());
+    if (AR.isActionPresentByName(params.actionname.get())) {
+      const Action *instance = AR.getActionByName(params.actionname.get());
       // else give description of Action and its option value if present
       std::cout << instance->help();

src/Actions/FragmentationAction/MolecularDynamicsAction.cpp

@@ -41 +41 @@
 #include "Actions/FragmentationAction/MolecularDynamicsAction.hpp"
 #include "Actions/MoleculeAction/VerletIntegrationAction.hpp"
-#include "Actions/ActionRegistry.hpp"
+#include "Actions/ActionQueue.hpp"
 #include "Actions/ActionSequence.hpp"
 
@@ -71 +71 @@
 Action::state_ptr FragmentationMolecularDynamicsAction::performCall(){
   // now we can truely prepare
-  ActionRegistry &AR = ActionRegistry::getInstance();
+  ActionRegistry &AR = ActionQueue::getInstance().getActionRegistry();
   // perform a verlet-integration first, if there are already forces or velocities
   // present. If not, we still copy the position cleanly into a new step where then

src/Actions/GraphAction/SubgraphDissectionAction.cpp

@@ -42 +42 @@
 #include "Actions/GraphAction/UpdateMoleculesAction.hpp"
 #include "Actions/GraphAction/SubgraphDissectionAction.hpp"
-#include "Actions/ActionRegistry.hpp"
+#include "Actions/ActionQueue.hpp"
 
 #include "Descriptors/AtomDescriptor.hpp"
@@ -151 +151 @@
 )
 {
-  ACTION *ToCall = dynamic_cast<ACTION*>(ActionRegistry::getInstance().getActionByName( TOKEN )); //->clone(params);
+  ACTION *ToCall = dynamic_cast<ACTION*>(ActionQueue::getInstance().getActionRegistry().getActionByName( TOKEN )); //->clone(params);
   //ACTION::PARAMS params;
 #if defined paramreferences && BOOST_PP_NOT_EQUAL(MAXPARAMTYPES,0)
@@ -168 +168 @@
 #endif
   ) {
-  ACTION *ToCall = dynamic_cast<ACTION*>(ActionRegistry::getInstance().getActionByName( TOKEN )); //->clone(params);
+  ACTION *ToCall = dynamic_cast<ACTION*>(ActionQueue::getInstance().getActionRegistry().getActionByName( TOKEN )); //->clone(params);
   //ACTION::PARAMS params;
 #if defined paramtypes && defined paramtypes && BOOST_PP_NOT_EQUAL(MAXPARAMTYPES,0)

src/Actions/Makefile.am

@@ -5 +5 @@
   Actions/Action.cpp \
   Actions/ActionHistory.cpp \
+  Actions/ActionQueue.cpp \
   Actions/ActionRegistry.cpp \
   Actions/ActionSequence.cpp \
@@ -25 +26 @@
   Actions/Action_impl_undef.hpp \
   Actions/ActionHistory.hpp \
+  Actions/ActionQueue.hpp \
   Actions/ActionRegistry.hpp \
   Actions/ActionSequence.hpp \

src/Actions/MakroAction_impl_pre.hpp

@@ -50 +50 @@
 #include <boost/preprocessor/seq/transform.hpp>
 
+#include "Actions/ActionQueue.hpp"
 #include "Parameters/Parameter.hpp"
 
@@ -289 +290 @@
 )
 {
-  ACTION *ToCall = dynamic_cast<ACTION*>(ActionRegistry::getInstance().getActionByName( TOKEN )); //->clone(params);
+  ACTION *ToCall = dynamic_cast<ACTION*>(ActionQueue::getInstance().getActionRegistry().getActionByName( TOKEN )); //->clone(params);
   //ACTION::PARAMS params;
 #if defined paramreferences && BOOST_PP_NOT_EQUAL(MAXPARAMTYPES,0)
@@ -306 +307 @@
 #endif
         ) {
-  ACTION *ToCall = dynamic_cast<ACTION*>(ActionRegistry::getInstance().getActionByName( TOKEN )); //->clone(params);
+  ACTION *ToCall = dynamic_cast<ACTION*>(ActionQueue::getInstance().getActionRegistry().getActionByName( TOKEN )); //->clone(params);
   //ACTION::PARAMS params;
 #if defined paramtypes && defined paramtypes && BOOST_PP_NOT_EQUAL(MAXPARAMTYPES,0)

src/Actions/OptionRegistry.cpp

@@ -38 +38 @@
 
 #include "Actions/Action.hpp"
-#include "Actions/ActionRegistry.hpp"
+#include "Actions/ActionQueue.hpp"
 #include "Actions/ActionTrait.hpp"
 #include "Actions/OptionRegistry.hpp"
@@ -71 +71 @@
 //void OptionRegistry::Init()
 //{
-//  ActionRegistry &AR = ActionRegistry::getInstance();
+//  ActionRegistry &AR = ActionQueue::getInstance().getActionRegistry();
 //  for (ActionRegistry::const_iterator actioniter = AR.getBeginIter();
 //      actioniter != AR.getEndIter();
@@ -98 +98 @@
 void OptionRegistry::ConsistencyCheck()
 {
-  ActionRegistry &AR = ActionRegistry::getInstance();
+  ActionRegistry &AR = ActionQueue::getInstance().getActionRegistry();
   for (ActionRegistry::const_iterator actioniter = AR.getBeginIter();
       actioniter != AR.getEndIter();

src/Actions/Reaction_impl_pre.hpp

@@ -42 +42 @@
 #include <boost/preprocessor/seq/transform.hpp>
 
+#include "Actions/ActionQueue.hpp"
+
 // some derived names: if CATEGORY is not given, we don't prefix with it
 #ifdef CATEGORY
@@ -192 +194 @@
 )
 {
-  Action *ToCall = ActionRegistry::getInstance().getActionByName( TOKEN ); //->clone(params);
+  Action *ToCall = ActionQueue::getInstance().getActionRegistry().getActionByName( TOKEN ); //->clone(params);
   //REACTION::PARAMS params;
 #if BOOST_PP_NOT_EQUAL(MAXPARAMTYPES,0)
@@ -211 +213 @@
 #endif
         ) {
-  Action *ToCall = ActionRegistry::getInstance().getActionByName( TOKEN ); //->clone(params);
+  Action *ToCall = ActionQueue::getInstance().getActionRegistry().getActionByName( TOKEN ); //->clone(params);
   //REACTION::PARAMS params;
 #if BOOST_PP_NOT_EQUAL(MAXPARAMTYPES,0)

src/Actions/pyMoleCuilder.cpp

@@ -38 +38 @@
 
 #include "CodePatterns/MemDebug.hpp"
+#include "CodePatterns/toString.hpp"
 
 //!> define all present actions

src/Actions/unittests/ActionRegistryUnitTest.cpp

@@ -41 +41 @@
 #include <typeinfo>
 
+#include "Actions/ActionQueue.hpp"
 #include "Actions/ActionRegistry.hpp"
 #include "Actions/ActionTrait.hpp"
@@ -60 +61 @@
 void ActionRegistryTest::setUp()
 {
-  ActionRegistry::getInstance();
+  AR = &ActionQueue::getInstance().getActionRegistry();
 };
 
@@ -66 +67 @@
 void ActionRegistryTest::tearDown()
 {
-  ActionRegistry::purgeInstance();
+  ActionQueue::purgeInstance();
 };
 
@@ -73 +74 @@
   std::map <std::string, std::string> result;
 
-  ActionRegistry &AR = ActionRegistry::getInstance();
-  for (ActionRegistry::const_iterator iter = AR.getBeginIter(); iter != AR.getEndIter(); ++iter) {
+  for (ActionRegistry::const_iterator iter = AR->getBeginIter(); iter != AR->getEndIter(); ++iter) {
     if ((iter->second)->Traits.hasShortForm()) {
       ASSERT(result.find((iter->second)->Traits.getShortForm()) == result.end(),

src/Actions/unittests/ActionRegistryUnitTest.hpp

@@ -17 +17 @@
 #include <cppunit/extensions/HelperMacros.h>
 
+namespace MoleCuilder {
+class ActionRegistry;
+};
 
 /********************************************** Test classes **************************************/
@@ -32 +35 @@
 
 private:
+      MoleCuilder::ActionRegistry *AR;
 };
 

src/Actions/unittests/ActionSequenceUnitTest.cpp

@@ -40 +40 @@
 #include "ActionSequenceUnitTest.hpp"
 #include "Actions/Action.hpp"
+#include "Actions/ActionHistory.hpp"
+#include "Actions/ActionQueue.hpp"
 #include "Actions/ActionSequence.hpp"
 #include "Actions/MakroAction.hpp"
-#include "Actions/ActionHistory.hpp"
-#include "Actions/ActionRegistry.hpp"
 
 #include "stubs/DummyUI.hpp"
@@ -191 +191 @@
 
   ActionHistory::purgeInstance();
-  ActionRegistry::purgeInstance();
+  ActionQueue::purgeInstance();
   {
     UIFactory::purgeInstance();

src/Actions/unittests/AtomsCalculationUnitTest.cpp

@@ -45 +45 @@
 #include "Actions/AtomsCalculation.hpp"
 #include "Actions/AtomsCalculation_impl.hpp"
-#include "Actions/ActionRegistry.hpp"
+#include "Actions/ActionQueue.hpp"
 #include "Actions/ActionTrait.hpp"
 
@@ -71 +71 @@
 void AtomsCalculationTest::tearDown(){
   World::purgeInstance();
-  ActionRegistry::purgeInstance();
+  ActionQueue::purgeInstance();
 }
 

src/Actions/unittests/ManipulateAtomsUnitTest.cpp

@@ -43 +43 @@
 #include "Descriptors/AtomIdDescriptor.hpp"
 #include "Actions/ManipulateAtomsProcess.hpp"
-#include "Actions/ActionRegistry.hpp"
+#include "Actions/ActionQueue.hpp"
 #include "Actions/ActionHistory.hpp"
 
@@ -120 +120 @@
 void manipulateAtomsTest::tearDown(){
   World::purgeInstance();
-  ActionRegistry::purgeInstance();
+  ActionQueue::purgeInstance();
   ActionHistory::purgeInstance();
   {