Changeset 4a328f 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:

5d8f4f

Parents:

7f1865d

git-author:

Frederik Heber <heber@…> (12/28/15 15:09:49)

git-committer:

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

Message:

FIX: AtomObserver was not up-to-date with respect to atom's channels.

Location:

src/Atom

Files:

• AtomObserver.cpp (modified) (3 diffs)
• unittests/AtomObserverUnitTest.cpp (modified) (5 diffs)
• unittests/AtomObserverUnitTest.hpp (modified) (2 diffs)

src/Atom/AtomObserver.cpp

@@ -53 +53 @@
   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);
 }
 
@@ -70 +79 @@
 {
   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);
 }
 
@@ -81 +99 @@
 {
   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);
 }
 

src/Atom/unittests/AtomObserverUnitTest.cpp

@@ -68 +68 @@
   // observer checks that we don't receive general updates ...
   observer = new UpdateCountObserver;
-  // but only specific notifications in observer1 and observer2
-  observer1 = new NotificationObserver(
-      AtomObserver::getInstance().getChannel(AtomObservable::PositionChanged)
-      );
-  observer2 = new NotificationObserver(
-      AtomObserver::getInstance().getChannel(AtomObservable::ElementChanged)
-      );
+  AtomObserver::getInstance().signOn(observer);
 
-  AtomObserver::getInstance().signOn(observer);
-  AtomObserver::getInstance().signOn(observer1, AtomObservable::PositionChanged);
-  AtomObserver::getInstance().signOn(observer2, AtomObservable::ElementChanged);
+  // but only specific notifications in others observers
+  for (int i=0;i<AtomObservable::NotificationType_MAX; ++i) {
+    specific_observers.push_back(new NotificationObserver(
+          AtomObserver::getInstance().getChannel((enum AtomObservable::NotificationType)i)
+          ));
+    AtomObserver::getInstance().signOn(
+        specific_observers.back(), (enum AtomObservable::NotificationType)i);
+  }
+
 
   for(int i=0;i<ATOM_COUNT;++i){
@@ -89 +89 @@
 {
   AtomObserver::getInstance().signOff(observer);
-  AtomObserver::getInstance().signOff(observer1, AtomObservable::PositionChanged);
-  AtomObserver::getInstance().signOff(observer2, AtomObservable::ElementChanged);
+  for (int i=0;i<AtomObservable::NotificationType_MAX; ++i) {
+    AtomObserver::getInstance().signOff(specific_observers[i], (enum AtomObservable::NotificationType)i);
+    delete specific_observers[i];
+  }
+  specific_observers.clear();
 
   delete observer;
-  delete observer1;
-  delete observer2;
 
   World::purgeInstance();
@@ -107 +108 @@
   // check for zero update
   CPPUNIT_ASSERT_EQUAL( (int)0, observer->updates );
-  CPPUNIT_ASSERT_EQUAL( false, observer1->wasNotified );
-  CPPUNIT_ASSERT_EQUAL( false, observer2->wasNotified );
+  for (int i=0;i<AtomObservable::NotificationType_MAX; ++i) {
+
+    CPPUNIT_ASSERT_EQUAL( false, specific_observers[i]->wasNotified );
+  }
 }
 
@@ -120 +123 @@
 
   // check for update
-  CPPUNIT_ASSERT_EQUAL( true, observer1->wasNotified );
-  CPPUNIT_ASSERT_EQUAL( false, observer2->wasNotified );
+  for (int i=0;i<AtomObservable::NotificationType_MAX; ++i) {
+    CPPUNIT_ASSERT_EQUAL( (enum AtomObservable::NotificationType)i == AtomObservable::PositionChanged,
+        specific_observers[i]->wasNotified );
+  }
   CPPUNIT_ASSERT_EQUAL( (int)0, observer->updates );
 }
@@ -134 +139 @@
 
   // check for update
-  CPPUNIT_ASSERT_EQUAL( false, observer1->wasNotified );
-  CPPUNIT_ASSERT_EQUAL( true, observer2->wasNotified );
+  for (int i=0;i<AtomObservable::NotificationType_MAX; ++i) {
+    CPPUNIT_ASSERT_EQUAL( (enum AtomObservable::NotificationType)i == AtomObservable::ElementChanged,
+        specific_observers[i]->wasNotified );
+  }
   CPPUNIT_ASSERT_EQUAL( (int)0, observer->updates );
 }

src/Atom/unittests/AtomObserverUnitTest.hpp

@@ -16 +16 @@
 
 #include <cppunit/extensions/HelperMacros.h>
+
+#include <vector>
 
 #include "types.hpp"
@@ -48 +50 @@
 
   UpdateCountObserver *observer;
-  NotificationObserver *observer1;
-  NotificationObserver *observer2;
+  std::vector<NotificationObserver *> specific_observers;
 };