Changeset d4ba3f for src/Atom

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.

Location:

src/Atom

Files:

• AtomObserver.cpp (modified) (1 diff)
• AtomObserver.hpp (modified) (2 diffs)
• atom.cpp (modified) (3 diffs)

src/Atom/AtomObserver.cpp

@@ -36 +36 @@
 #include "CodePatterns/MemDebug.hpp"
 
-#include "AtomObserver.hpp"
+#include <boost/assign.hpp>
 
 #include "CodePatterns/Singleton_impl.hpp"
 
-#include "Atom/atom.hpp"
 #include "Atom/atom_observable.hpp"
 
+#include "AtomObserver.hpp"
 
-/** Private constructor of class AtomObserver.
- *
- */
-AtomObserver::AtomObserver() :
-  Relay(std::string("AtomObserver"))
+using namespace boost::assign;
+
+static const Observable::channels_t getAtomChannels()
 {
-  Channels *OurChannel = new Channels();
-  Observable::insertNotificationChannel( std::make_pair(static_cast<Observable *>(this), OurChannel) );
-  OurChannel->addChannel(AtomObservable::PositionChanged);
-  OurChannel->addChannel(AtomObservable::VelocityChanged);
-  OurChannel->addChannel(AtomObservable::ForceChanged);
-  OurChannel->addChannel(AtomObservable::MoleculeChanged);
-  OurChannel->addChannel(AtomObservable::NameChanged);
-  OurChannel->addChannel(AtomObservable::ElementChanged);
-  OurChannel->addChannel(AtomObservable::IndexChanged);
-  OurChannel->addChannel(AtomObservable::PropertyChanged);
-  OurChannel->addChannel(AtomObservable::BondsAdded);
-  OurChannel->addChannel(AtomObservable::BondsRemoved);
-  OurChannel->addChannel(AtomObservable::TrajectoryChanged);
-  OurChannel->addChannel(AtomObservable::SelectionChanged);
+  Observable::channels_t channels;
+  for (int i=0;i<AtomObservable::NotificationType_MAX; ++i)
+    channels += (enum AtomObservable::NotificationType)i;
+  return channels;
 }
 
-/** Private Destructor of class AtomObserver.
- *
- */
-AtomObserver::~AtomObserver()
+const Observable::channels_t AtomObserver::AtomChannels(getAtomChannels());
+
+AtomObserver::AtomObserver() :
+    EntityObserver<atom>(AtomChannels, std::string("AtomObserver"))
 {}
 
-/** Function to call when a new atom has been created.
- *
- * @param res
- */
-void AtomObserver::AtomInserted(atom *res)
-{
-  res->signOn(this, AtomObservable::PositionChanged);
-  res->signOn(this, AtomObservable::VelocityChanged);
-  res->signOn(this, AtomObservable::ForceChanged);
-  res->signOn(this, AtomObservable::MoleculeChanged);
-  res->signOn(this, AtomObservable::NameChanged);
-  res->signOn(this, AtomObservable::ElementChanged);
-  res->signOn(this, AtomObservable::IndexChanged);
-  res->signOn(this, AtomObservable::PropertyChanged);
-  res->signOn(this, AtomObservable::BondsAdded);
-  res->signOn(this, AtomObservable::BondsRemoved);
-  res->signOn(this, AtomObservable::TrajectoryChanged);
-  res->signOn(this, AtomObservable::SelectionChanged);
-}
-
-/** Function to call when an atom is about to get deleted.
- *
- * @param res
- */
-void AtomObserver::AtomRemoved(atom *res)
-{
-  res->signOff(this, AtomObservable::PositionChanged);
-  res->signOff(this, AtomObservable::VelocityChanged);
-  res->signOff(this, AtomObservable::ForceChanged);
-  res->signOff(this, AtomObservable::MoleculeChanged);
-  res->signOff(this, AtomObservable::NameChanged);
-  res->signOff(this, AtomObservable::ElementChanged);
-  res->signOff(this, AtomObservable::IndexChanged);
-  res->signOff(this, AtomObservable::PropertyChanged);
-  res->signOff(this, AtomObservable::BondsAdded);
-  res->signOff(this, AtomObservable::BondsRemoved);
-  res->signOff(this, AtomObservable::TrajectoryChanged);
-  res->signOff(this, AtomObservable::SelectionChanged);
-}
-
 CONSTRUCT_SINGLETON(AtomObserver)

src/Atom/AtomObserver.hpp

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

src/Atom/atom.cpp

@@ -60 +60 @@
 {
   // note AtomObserver about inserted atom
-  AtomObserver::getInstance().AtomInserted(this);
+  AtomObserver::getInstance().Inserted(this);
 }
 
@@ -75 +75 @@
 
   // note AtomObserver about inserted atom
-  AtomObserver::getInstance().AtomInserted(this);
+  AtomObserver::getInstance().Inserted(this);
 };
 
@@ -95 +95 @@
   removeFromMolecule();
   // note AtomObserver about removed atom
-  AtomObserver::getInstance().AtomRemoved(this);
+  AtomObserver::getInstance().Removed(this);
 }