Changeset 0c1d97 for src/Patterns/Observer.cpp

Timestamp:

Feb 3, 2010, 2:11:10 PM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

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:

314ff6

Parents:

9ad391

git-author:

Tillmann Crueger <crueger@…> (02/03/10 14:07:23)

git-committer:

Tillmann Crueger <crueger@…> (02/03/10 14:11:10)

Message:

Added mechanism that allows for assign priorities to observers

File:

• src/Patterns/Observer.cpp (modified) (6 diffs)

src/Patterns/Observer.cpp

@@ -10 +10 @@
 
 #include <iostream>
+#include <cassert>
 
 using namespace std;
@@ -24 +25 @@
 
 map<Observable*, int> Observable::depth;
-multimap<Observable*,Observer*> Observable::callTable;
+map<Observable*,multimap<int,Observer*>*> Observable::callTable;
 set<Observable*> Observable::busyObservables;
 
@@ -54 +55 @@
 /************* Notification mechanism for observables **************/
 
-typedef multimap<Observable*,Observer*>::iterator callIterator;
-typedef pair<callIterator, callIterator> iteratorRange;
 
 void Observable::notifyAll() {
@@ -64 +63 @@
   // and call all observers
   if(callTable.count(this)) {
-     iteratorRange callerRange = callTable.equal_range(this);
-     callIterator iter;
-     for(iter=callerRange.first;iter!=callerRange.second;iter++){
-       (*iter).second->update(this);
-     }
+    // elements are stored sorted by keys in the multimap
+    // so iterating over it gives us a the callees sorted by
+    // the priorities
+    callees_t *callees = callTable[this];
+    callees_t::iterator iter;
+    for(iter=callees->begin();iter!=callees->end();iter++){
+      (*iter).second->update(this);
+    }
   }
   // done with notification, we can leave the set of busy subjects
@@ -97 +99 @@
 
 // methods to sign-on and off
-void Observable::signOn(Observer *target) {
+void Observable::signOn(Observer *target,int priority) {
+  assert(priority>=-20 && priority<=+20 && "Priority out of range [-20:+20]");
   bool res = false;
-  iteratorRange callerRange = callTable.equal_range(this);
-  callIterator iter;
-  for(iter=callerRange.first;iter!=callerRange.second;iter++){
+  callees_t *callees = 0;
+  if(callTable.count(this)){
+    callees = callTable[this];
+  }
+  else {
+    callees = new multimap<int,Observer*>;
+    callTable.insert(pair<Observable*,callees_t*>(this,callees));
+  }
+
+  callees_t::iterator iter;
+  for(iter=callees->begin();iter!=callees->end();iter++){
     res |= ((*iter).second == target);
   }
   if(!res)
-    callTable.insert(pair<Observable*,Observer*>(this,target));
+    callees->insert(pair<int,Observer*>(priority,target));
 }
 
 void Observable::signOff(Observer *target) {
-  iteratorRange callerRange = callTable.equal_range(this);
-  callIterator iter;
-  for(iter=callerRange.first;iter!=callerRange.second;iter++) {
+  assert(callTable.count(this) && "SignOff called for an Observable without Observers.");
+  callees_t *callees = callTable[this];
+  callees_t::iterator iter;
+  for(iter=callees->begin();iter!=callees->end();iter++) {
     if((*iter).second == target)
-      callTable.erase(iter);
+      callees->erase(iter);
+  }
+  if(callees->empty()){
+    callTable.erase(this);
+    delete callees;
   }
 }
@@ -127 +143 @@
 Observable::~Observable()
 {
-  // delete all entries for this observable
-  iteratorRange callerRange = callTable.equal_range(this);
-  callIterator iter;
-  for(iter=callerRange.first;iter!=callerRange.second;iter++){
-    (*iter).second->subjectKilled(this);
+  if(callTable.count(this)) {
+    // delete all entries for this observable
+    callees_t *callees = callTable[this];
+    callees_t::iterator iter;
+    for(iter=callees->begin();iter!=callees->end();iter++){
+      (*iter).second->subjectKilled(this);
+    }
+    callTable.erase(this);
+    delete callees;
   }
-  callTable.erase(callerRange.first,callerRange.second);
 }