Changeset 2f40c0e for src

Timestamp:

Jun 21, 2010, 12:56:35 PM (15 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:

a1e929

Parents:

55240c4

Message:

ChangeTracker now uses the Singleton pattern.

• ChangeTracker is now using Patterns/Singleton[_impl].hpp
• ParserUnitTest then has to destroy the Tracker explicitely and before World is purged!

Location:

src

Files:

• Parser/ChangeTracker.cpp (modified) (3 diffs)
• Parser/ChangeTracker.hpp (modified) (2 diffs)
• Parser/FormatParser.cpp (modified) (2 diffs)
• unittests/ParserUnitTest.cpp (modified) (1 diff)

src/Parser/ChangeTracker.cpp

@@ -7 +7 @@
 
 #include "Helpers/MemDebug.hpp"
+#include "Parser/ChangeTracker.hpp"
+#include "Patterns/Singleton_impl.hpp"
 
-#include "ChangeTracker.hpp"
-
-ChangeTracker* ChangeTracker::instance = NULL;
 
 /**
@@ -27 +26 @@
 ChangeTracker::~ChangeTracker() {
   World::getInstance().signOff(this);
-}
-
-/**
- * Returns the change tracker instance.
- *
- * \return this
- */
-ChangeTracker* ChangeTracker::get() {
-  if (instance == NULL) {
-    instance = new ChangeTracker();
-  }
-
-  return instance;
-}
-
-/**
- * Destroys the change tracker instance. Be careful, the change tracker is a
- * singleton and destruction might lead to a loss of consistency.
- */
-void ChangeTracker::destroy() {
-  delete instance;
-  instance = NULL;
 }
 
@@ -76 +53 @@
   }
 }
+
+CONSTRUCT_SINGLETON(ChangeTracker)

src/Parser/ChangeTracker.hpp

@@ -18 +18 @@
  * changes to it.
  */
-class ChangeTracker : public Observable {
+class ChangeTracker : public Singleton<ChangeTracker>, public Observable {
+  friend class Singleton<ChangeTracker>;
 public:
   void saveStatus();
@@ -31 +32 @@
   bool isConsistent;
   static ChangeTracker* instance;
+
+  // private constructor and destructor due to singleton
   ChangeTracker();
   ~ChangeTracker();

src/Parser/FormatParser.cpp

@@ -19 +19 @@
   Observer("FormatParser")
 {
-  ChangeTracker::get()->signOn(this);
+  ChangeTracker::getInstance().signOn(this);
   saveStream = NULL;
 }
@@ -27 +27 @@
  */
 FormatParser::~FormatParser() {
-  ChangeTracker::get()->signOff(this);
+  ChangeTracker::getInstance().signOff(this);
 }
 

src/unittests/ParserUnitTest.cpp

@@ -150 +150 @@
 
 void ParserUnitTest::tearDown() {
+  ChangeTracker::purgeInstance();
   World::purgeInstance();
 }