Changeset d6b12c

Timestamp:

Jul 2, 2012, 7:53:25 AM (12 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:

fb255d

Parents:

a06358c

git-author:

Frederik Heber <heber@…> (02/29/12 16:07:33)

git-committer:

Frederik Heber <heber@…> (07/02/12 07:53:25)

Message:

FragmentQueue is now observable.

• this is preparatory for allowing FragmentScheduler to send jobs to worker when new ones have arrived.
• added NotificationObserver to FragmentQueueUnitTest.

Location:

src/Fragmentation/Automation

Files:

• FragmentQueue.cpp (modified) (4 diffs)
• FragmentQueue.hpp (modified) (3 diffs)
• unittests/FragmentQueueUnitTest.cpp (modified) (6 diffs)
• unittests/FragmentQueueUnitTest.hpp (modified) (2 diffs)
• unittests/Makefile.am (modified) (1 diff)

src/Fragmentation/Automation/FragmentQueue.cpp

@@ -23 +23 @@
 
 #include "CodePatterns/Assert.hpp"
+#include "CodePatterns/Observer/Channels.hpp"
 #include "CodePatterns/Log.hpp"
 
@@ -33 +34 @@
  *
  */
-FragmentQueue::FragmentQueue()
-{}
+FragmentQueue::FragmentQueue() :
+    Observable("FragmentQueue")
+{
+  // observable stuff
+  Channels *OurChannel = new Channels;
+  NotificationChannels.insert( std::make_pair(this, OurChannel) );
+  // add instance for each notification type
+  for (size_t type = 0; type < NotificationType_MAX; ++type)
+    OurChannel->addChannel(type);
+}
 
 /** Destructor for class FragmentQueue.
@@ -65 +74 @@
   ASSERT(!results.count(job->getId()),
       "FragmentQueue::pushJob() - job id "+toString(job->getId())+" has already been used.");
+  OBSERVE;
+  NOTIFY(JobAdded);
   results.insert( std::make_pair(job->getId(), NoResult));
   jobs.push_back(job);
@@ -92 +103 @@
 FragmentJob::ptr FragmentQueue::popJob()
 {
+  OBSERVE;
+  NOTIFY(JobRemoved);
   ASSERT(jobs.size(),
       "FragmentQueue::popJob() - there are no jobs on the queue.");

src/Fragmentation/Automation/FragmentQueue.hpp

@@ -18 +18 @@
 #include <vector>
 
+#include "CodePatterns/Observer/Observable.hpp"
+
 #include "types.hpp"
 #include "Jobs/FragmentJob.hpp"
@@ -28 +30 @@
  * contained herein.
  */
-class FragmentQueue
+class FragmentQueue : public Observable
 {
   friend class FragmentQueueTest;
@@ -34 +36 @@
   FragmentQueue();
   ~FragmentQueue();
+
+  enum NotificationType {
+    JobAdded,
+    JobRemoved,
+    NotificationType_MAX  // denotes the maximum of available notification types
+  };
 
   // entering jobs into queue

src/Fragmentation/Automation/unittests/FragmentQueueUnitTest.cpp

@@ -29 +29 @@
 #include "FragmentQueue.hpp"
 
+#include "CodePatterns/Observer/Channels.hpp"
 
 #ifdef HAVE_TESTRUNNER
@@ -37 +38 @@
 
 #include "stubs/FragmentJobStub.hpp"
+#include "unittests/stubs/ObserverStub.hpp"
 
 // Registers the fixture into the 'registry'
@@ -48 +50 @@
 
   queue = new FragmentQueue();
+  addobserver = new NotificationObserver(queue->getChannel(FragmentQueue::JobAdded));
+  removeobserver = new NotificationObserver(queue->getChannel(FragmentQueue::JobRemoved));
+
+  // and sign on
+  queue->signOn(addobserver, FragmentQueue::JobAdded);
+  queue->signOn(removeobserver, FragmentQueue::JobRemoved);
 }
 
@@ -53 +61 @@
 void FragmentQueueTest::tearDown()
 {
+  queue->signOff(addobserver, FragmentQueue::JobAdded);
+  queue->signOff(removeobserver, FragmentQueue::JobRemoved);
+
   delete queue;
+  delete removeobserver;
+  delete addobserver;
 }
 
@@ -76 +89 @@
   queue->pushJob(testJob);
 #endif
+  CPPUNIT_ASSERT( addobserver->wasNotified );
+  CPPUNIT_ASSERT( !removeobserver->wasNotified );
+  addobserver->wasNotified = false;
 
   CPPUNIT_ASSERT_EQUAL((size_t)1, queue->jobs.size());
@@ -101 +117 @@
   poppedJob = queue->popJob();
 #endif
+  CPPUNIT_ASSERT( !addobserver->wasNotified );
+  CPPUNIT_ASSERT( removeobserver->wasNotified );
   CPPUNIT_ASSERT( poppedJob == testJob );
 

src/Fragmentation/Automation/unittests/FragmentQueueUnitTest.hpp

@@ -18 +18 @@
 
 class FragmentQueue;
+class NotificationObserver;
 
 /********************************************** Test classes **************************************/
@@ -42 +43 @@
 private:
       FragmentQueue *queue;
+      NotificationObserver *addobserver;
+      NotificationObserver *removeobserver;
 };
 

src/Fragmentation/Automation/unittests/Makefile.am

@@ -63 +63 @@
 
 FragmentQueueUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
-FragmentQueueUnitTest_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
+FragmentQueueUnitTest_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS} -I$(top_srcdir)/src
 FragmentQueueUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
   unittests/FragmentQueueUnitTest.cpp \
   unittests/FragmentQueueUnitTest.hpp \
   unittests/stubs/FragmentJobStub.cpp \
-  unittests/stubs/FragmentJobStub.hpp
+  unittests/stubs/FragmentJobStub.hpp \
+  $(top_srcdir)/src/unittests/stubs/ObserverStub.cpp \
+  $(top_srcdir)/src/unittests/stubs/ObserverStub.hpp
 FragmentQueueUnitTest_LDADD = \
   libMolecuilderFragmentJobs.la \