Changeset 97c2550

Timestamp:

Jan 2, 2012, 1:00:05 PM (13 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:

402f2c

Parents:

5dfabd

git-author:

Frederik Heber <heber@…> (12/19/11 14:12:54)

git-committer:

Frederik Heber <heber@…> (01/02/12 13:00:05)

Message:

Added unit test for AtomObserver.

• added position and element channels from AtomObservable to AtomObserver.
• NOTE: AtomObserver does not relay general update() calls.

Location:

src

Files:

• Atom/AtomObserver.cpp (modified) (3 diffs)
• Atom/AtomObserver.hpp (modified) (1 diff)
• Atom/unittests/AtomObserverUnitTest.cpp (added)
• Atom/unittests/AtomObserverUnitTest.hpp (added)
• Atom/unittests/Makefile.am (added)
• Atom/unittests/stubs/ObserverStub.cpp (added)
• Atom/unittests/stubs/ObserverStub.hpp (added)
• unittests/Makefile.am (modified) (1 diff)

src/Atom/AtomObserver.cpp

@@ -25 +25 @@
 
 #include "Atom/atom.hpp"
+#include "Atom/atom_observable.hpp"
 
 
@@ -32 +33 @@
 AtomObserver::AtomObserver() :
   Relay(std::string("AtomObserver"))
-{}
+{
+  Channels *OurChannel = new Channels();
+  NotificationChannels.insert( std::make_pair(this, OurChannel) );
+  OurChannel->addChannel(AtomObservable::PositionChanged);
+  OurChannel->addChannel(AtomObservable::ElementChanged);
+}
 
 /** Private Destructor of class AtomObserver.
@@ -50 +56 @@
 }
 
-/** Callback function for Observer mechanism.
- *
- * @param publisher reference to the Observable that calls
- */
-void AtomObserver::update(Observable *publisher)
-{}
-
-/** Callback function for the Notifications mechanism.
- *
- * @param publisher reference to the Observable that calls
- * @param notification specific notification as cause of the call
- */
-void AtomObserver::recieveNotification(Observable *publisher, Notification_ptr notification)
-{}
-
-/** Callback function when an Observer dies.
- *
- * @param publisher reference to the Observable that calls
- */
-void AtomObserver::subjectKilled(Observable *publisher)
-{}
-
-
 CONSTRUCT_SINGLETON(AtomObserver)

src/Atom/AtomObserver.hpp

@@ -36 +36 @@
 public:
 
-protected:
-  void update(Observable *publisher);
-  void recieveNotification(Observable *publisher, Notification_ptr notification);
-  void subjectKilled(Observable *publisher);
-
 private:
   void AtomInserted(atom *res);

src/unittests/Makefile.am

@@ -8 +8 @@
 include ../../src/Actions/unittests/Makefile.am
 include ../../src/Analysis/unittests/Makefile.am
+include ../../src/Atom/unittests/Makefile.am
 include ../../src/Descriptors/unittests/Makefile.am
 include ../../src/Element/unittests/Makefile.am