Changeset d4ba3f for src/MoleculeObserver.hpp

Timestamp:

Feb 11, 2016, 8:06:49 AM (9 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:

ada8df

Parents:

5d8f4f

git-author:

Frederik Heber <heber@…> (12/29/15 14:23:09)

git-committer:

Frederik Heber <heber@…> (02/11/16 08:06:49)

Message:

Extracted common code out of Molecule/AtomObserver into EntityObserver.

• also all channels are generated as a static vector via boost::assign.
• removed AtomObserverStub, does not work anymore with extracted EntityObserver.

File:

• src/MoleculeObserver.hpp (modified) (2 diffs)

src/MoleculeObserver.hpp

@@ -14 +14 @@
 #endif
 
-#include "CodePatterns/Observer/Relay.hpp"
 #include "CodePatterns/Singleton.hpp"
+
+#include "EntityObserver.hpp"
 
 class molecule;
@@ -21 +22 @@
 /** The MoleculeObserver is a central instance to all changes occuring within molecules.
  *
- * The intent is that if a class wants to know about changes in just _any_ molecule,
- * he may register singly to this class and not to each and every molecule. This also
- * keeps him updated in case of removed or added molecules.
- *
- * \warning MoleculeObserver must get purged \b after World as we do not keep an
- * an internal list of all molecules. Hence, each molecule must get destroyed while
- * the MoleculeObserver instance is still intact or segfault will occur.
+ * It implements the templated EntityObserver class for molecules.
  *
  * \sa AtomObserver
  */
-class MoleculeObserver : public Singleton<MoleculeObserver>, public Relay
+class MoleculeObserver : public Singleton< MoleculeObserver >, public EntityObserver<molecule>
 {
   //!> grant Singleton access to cstor and dstor.
-  friend class Singleton<MoleculeObserver>;
+  friend class Singleton< MoleculeObserver >;
 
-  //!> grant molecule access
-  friend class molecule;
-public:
-
-private:
-  void MoleculeInserted(molecule *res);
-  void MoleculeRemoved(molecule *res);
+  //!> list of all observed channels
+  static const Observable::channels_t MoleculeChannels;
 
   // private constructor and destructor due to singleton
   MoleculeObserver();
-  virtual ~MoleculeObserver();
 };