Changeset e73a8a2

Timestamp:

Mar 11, 2010, 2:08:44 PM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

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:

aee1a3

Parents:

7ca806

Message:

Changed ActionRegistry to use the new Singleton Mechanism

Location:

src

Files:

• Actions/Action.cpp (modified) (1 diff)
• Actions/ActionRegistry.cpp (modified) (3 diffs)
• Actions/ActionRegistry.hpp (modified) (2 diffs)
• builder.cpp (modified) (1 diff)
• unittests/SingletonTest.cpp (modified) (1 diff)
• unittests/atomsCalculationTest.cpp (modified) (1 diff)
• unittests/manipulateAtomsTest.cpp (modified) (1 diff)

src/Actions/Action.cpp

@@ -17 +17 @@
 {
   if(_doRegister){
-    ActionRegistry::getRegistry()->registerAction(this);
+    ActionRegistry::getInstance().registerAction(this);
   }
 }

src/Actions/ActionRegistry.cpp

@@ -9 +9 @@
 #include "Actions/Action.hpp"
 
+#include "Patterns/Singleton_impl.hpp"
+
 #include <string>
 #include <cassert>
@@ -14 +16 @@
 
 using namespace std;
-
-ActionRegistry *ActionRegistry::theInstance=0;
 
 ActionRegistry::ActionRegistry()
@@ -43 +43 @@
 }
 
-// singleton stuff
-ActionRegistry* ActionRegistry::getRegistry(){
-  if(!theInstance){
-    theInstance = new ActionRegistry();
-  }
-  return theInstance;
-}
-
-void ActionRegistry::purgeRegistry(){
-  if(theInstance){
-    delete theInstance;
-    theInstance = 0;
-  }
-}
+CONSTRUCT_SINGLETON(ActionRegistry)

src/Actions/ActionRegistry.hpp

@@ -12 +12 @@
 #include <map>
 
+#include "Patterns/Singleton.hpp"
+
 class Action;
 
-class ActionRegistry
+class ActionRegistry : public Singleton<ActionRegistry>
 {
+  friend class Singleton<ActionRegistry>;
 public:
   Action* getActionByName(const std::string);
@@ -23 +26 @@
   std::map<const std::string,Action*> actionMap;
 
-// singleton stuff
-public:
-  static ActionRegistry* getRegistry();
-  static void purgeRegistry();
 private:
   ActionRegistry();
   virtual ~ActionRegistry();
-  static ActionRegistry *theInstance;
 };
 

src/builder.cpp

@@ -2177 +2177 @@
   logger::purgeInstance();
   errorLogger::purgeInstance();
-  ActionRegistry::purgeRegistry();
+  ActionRegistry::purgeInstance();
 }
 

src/unittests/SingletonTest.cpp

@@ -87 +87 @@
   CPPUNIT_ASSERT_EQUAL(1,SingletonStub1::count1);
   CPPUNIT_ASSERT_EQUAL(1,SingletonStub2::count1);
+  // no calls to the destructor should have occured so far
+  CPPUNIT_ASSERT_EQUAL(0,SingletonStub1::count2);
+  CPPUNIT_ASSERT_EQUAL(0,SingletonStub2::count2);
 
   SingletonStub1::purgeInstance();

src/unittests/atomsCalculationTest.cpp

@@ -63 +63 @@
 void atomsCalculationTest::tearDown(){
   World::purgeInstance();
-  ActionRegistry::purgeRegistry();
+  ActionRegistry::purgeInstance();
 }
 

src/unittests/manipulateAtomsTest.cpp

@@ -78 +78 @@
 void manipulateAtomsTest::tearDown(){
   World::purgeInstance();
-  ActionRegistry::purgeRegistry();
+  ActionRegistry::purgeInstance();
 }