Changeset 90821d for src/UIElements/Qt4/InstanceBoard

Timestamp:

Feb 12, 2016, 11:15:24 PM (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:

68418e

Parents:

494478

git-author:

Frederik Heber <heber@…> (01/25/16 14:07:59)

git-committer:

Frederik Heber <heber@…> (02/12/16 23:15:24)

Message:

Moved countSubjectKilled related code from QtObservedInstanceBoard into ObservedValuesContainer.

• this avoids some more duplicated code.

Location:

src/UIElements/Qt4/InstanceBoard

Files:

• ObservedValuesContainer.hpp (modified) (3 diffs)
• ObservedValuesContainer_impl.hpp (modified) (3 diffs)
• QtObservedAtom.cpp (modified) (1 diff)
• QtObservedInstanceBoard.cpp (modified) (2 diffs)
• QtObservedInstanceBoard.hpp (modified) (2 diffs)
• QtObservedMolecule.cpp (modified) (1 diff)

src/UIElements/Qt4/InstanceBoard/ObservedValuesContainer.hpp

@@ -19 +19 @@
 #include <map>
 #include <string>
+
+#include <boost/function.hpp>
 
 class QtObservedInstanceBoard;
@@ -56 +58 @@
   void returnObservedValues(const id _id, ObservedValues_t &_observedvalues);
 
+  /** Inform this container that subjectKilled() was received by one of the ObservedValues.
+   *
+   * \param _id identifier of the receiving instance
+   * \param _onDestroy function to call when last subjectKilled() was received and
+   *        ObservedValues are destroyed
+   */
+  void countsubjectKilled(
+      const id _id,
+      boost::function<void (const id _id)> _onDestroy);
+
 private:
   typedef std::pair<ObservedValues_t, size_t> RefCountedObservedValues_t;
@@ -61 +73 @@
   //!> internal vector of observed values
   CountedObservedValues_t ObservedValues;
+
+  //!> typedef for map with subjectKilledCounts for each instance
+  typedef std::map<id, size_t> subjectKilledCount_t;
+
+  //!> counts how many ObservedValues have already been subjectKilled()
+  subjectKilledCount_t subjectKilledCount;
 
   //!> name used in describing the instance type

src/UIElements/Qt4/InstanceBoard/ObservedValuesContainer_impl.hpp

@@ -90 +90 @@
 
 template <class T, typename id>
+void ObservedValuesContainer<T,id>::countsubjectKilled(
+    const id _id,
+    boost::function<void (const id _id)> _onDestroy)
+{
+  LOG(3, "DEBUG: ObservedValuesContainer got subjectKilled() for an observed value of "
+      << NameOfType << " " << _id);
+  typename subjectKilledCount_t::iterator iter = subjectKilledCount.find(_id);
+  if (iter == subjectKilledCount.end()) {
+    std::pair<typename subjectKilledCount_t::iterator, bool> inserter =
+        subjectKilledCount.insert( std::make_pair(_id, 0) );
+    iter = inserter.first;
+  }
+  ++(iter->second);
+
+  if (iter->second > T::MAX_ObservedTypes) {
+    ASSERT( getRefCount(_id) == 0,
+        "ObservedValuesContainer::countsubjectKilled() - observed Values for "
+        +NameOfType+" "+toString(_id)+" are still being held somewhere.");
+    _onDestroy(_id);
+    subjectKilledCount.erase(iter);
+  }
+}
+
+template <class T, typename id>
 bool ObservedValuesContainer<T,id>::insert(const id _id, ObservedValues_t &_obsvalues)
 {
@@ -103 +127 @@
   const typename CountedObservedValues_t::iterator Colditer = ObservedValues.find(_oldid);
   const typename CountedObservedValues_t::iterator Cnewiter = ObservedValues.find(_newid);
+  const typename subjectKilledCount_t::iterator Solditer = subjectKilledCount.find(_oldid);
+  const typename subjectKilledCount_t::iterator Snewiter = subjectKilledCount.find(_newid);
   bool status = ((Colditer != ObservedValues.end()) && (Cnewiter == ObservedValues.end()));
+  status &= ((Solditer != subjectKilledCount.end()) && (Snewiter == subjectKilledCount.end()));
   // change id here only if still present
   if (status) {
@@ -110 +137 @@
       ObservedValues.erase(Colditer);
       ObservedValues.insert( std::make_pair(_newid, obsvalues) );
+    }
+    {
+      const size_t countvalue = Solditer->second;
+      subjectKilledCount.erase(Solditer);
+      subjectKilledCount.insert( std::make_pair(_newid, countvalue) );
     }
     return true;

src/UIElements/Qt4/InstanceBoard/QtObservedAtom.cpp

@@ -173 +173 @@
     owner = NULL;
 
-    board.atomcountsubjectKilled(getAtomIndex());
+    board.returnObservedAtom(getAtomIndex());
   }
 }

src/UIElements/Qt4/InstanceBoard/QtObservedInstanceBoard.cpp

@@ -56 +56 @@
   atomObservedValues("atom", *this),
   moleculeObservedValues("molecule", *this),
-  atomSubjectKilled(
-      boost::bind(&QtObservedInstanceBoard::atomcountsubjectKilled, this, _1)),
-  moleculeSubjectKilled(
-      boost::bind(&QtObservedInstanceBoard::moleculecountsubjectKilled, this, _1)),
   lastremovedatom((atomId_t)-1),
   lastremovedatomsmolecule( std::make_pair((moleculeId_t)-1,(atomId_t)-1) ),
   lastremovedmolecule((moleculeId_t)-1)
 {
+  boost::function<void (const atomId_t _id)> atomfctor =
+      boost::bind(&QtObservedInstanceBoard::atomcountsubjectKilled, this, _1);
+  atomSubjectKilled = 
+      boost::bind(&ObservedValuesContainer<QtObservedAtom, atomId_t>::countsubjectKilled,
+          boost::ref(atomObservedValues),
+          _1,
+          atomfctor
+          );
+  boost::function<void (const moleculeId_t _id)> molfctor = 
+      boost::bind(&QtObservedInstanceBoard::moleculecountsubjectKilled, this, _1);
+  moleculeSubjectKilled = 
+      boost::bind(&ObservedValuesContainer<QtObservedMolecule, moleculeId_t>::countsubjectKilled,
+          boost::ref(moleculeObservedValues),
+          _1,
+          molfctor
+          );
+
   // be first (besides ObservedValues to know about new insertions)
   World::getInstance().signOn(this, World::AtomInserted, GlobalObservableInfo::PriorityLevel(int(-10)));
@@ -294 +307 @@
 void QtObservedInstanceBoard::atomcountsubjectKilled(const atomId_t _atomid)
 {
-  LOG(3, "DEBUG: InformationBoard got subjectKilled() for a value of atom " << _atomid);
-  atomsubjectKilledCount_t::iterator iter = atomsubjectKilledCount.find(_atomid);
-  if (iter == atomsubjectKilledCount.end()) {
-    std::pair<atomsubjectKilledCount_t::iterator, bool> inserter =
-        atomsubjectKilledCount.insert( std::make_pair(_atomid, 0) );
-    iter = inserter.first;
-  }
-  ++(iter->second);
-
-  if (iter->second > QtObservedAtom::MAX_ObservedTypes) {
-    ASSERT( atomObservedValues.getRefCount(_atomid) == 0,
-        "QtObservedInstanceBoard::atomcountsubjectKilled() - observed Values for atom "
-        +toString(_atomid)+" are still being held somewhere.");
-    if (_atomid == lastremovedatomsmolecule.second)
-      emit atomRemoved(lastremovedatomsmolecule.first, lastremovedatomsmolecule.second);
-    else
-      ELOG(2, "QtObservedInstanceBoard::atomcountsubjectKilled() - id " << _atomid
-          << " not fitting with " << lastremovedatomsmolecule);
-    atomsubjectKilledCount.erase(iter);
-  }
+  if (_atomid == lastremovedatomsmolecule.second)
+    emit atomRemoved(lastremovedatomsmolecule.first, lastremovedatomsmolecule.second);
+  else
+    ELOG(2, "QtObservedInstanceBoard::atomcountsubjectKilled() - id " << _atomid
+        << " not fitting with " << lastremovedatomsmolecule);
 }
 
 void QtObservedInstanceBoard::moleculecountsubjectKilled(const moleculeId_t _molid)
 {
-  LOG(3, "DEBUG: InformationBoard got subjectKilled() for a value of molecule " << _molid);
-  moleculesubjectKilledCount_t::iterator iter = moleculesubjectKilledCount.find(_molid);
-  if (iter == moleculesubjectKilledCount.end()) {
-    std::pair<moleculesubjectKilledCount_t::iterator, bool> inserter =
-        moleculesubjectKilledCount.insert( std::make_pair(_molid, 0) );
-    iter = inserter.first;
-  }
-  ++(iter->second);
-
-  if (iter->second > QtObservedMolecule::MAX_ObservedTypes) {
-    ASSERT( moleculeObservedValues.getRefCount(_molid) == 0,
-        "QtObservedInstanceBoard::moleculecountsubjectKilled() - observed Values for molecule "
-        +toString(_molid)+" are still being held somewhere.");
-    // then free the instance
-    emit moleculeRemoved(_molid);
-    moleculesubjectKilledCount.erase(iter);
-  }
+  emit moleculeRemoved(_molid);
 }
 

src/UIElements/Qt4/InstanceBoard/QtObservedInstanceBoard.hpp

@@ -133 +133 @@
   void moleculecountsubjectKilled(const moleculeId_t _molid);
 
-  //!> typedef for map with subjectKilledCounts for each atom
-  typedef typename std::map<atomId_t, size_t> atomsubjectKilledCount_t;
-
-  //!> typedef for map with subjectKilledCounts for each molecule
-  typedef typename std::map<moleculeId_t, size_t> moleculesubjectKilledCount_t;
-
-  //!> counts how many ObservedValues have already been subjectKilled()
-  atomsubjectKilledCount_t atomsubjectKilledCount;
-
-  //!> counts how many ObservedValues have already been subjectKilled()
-  moleculesubjectKilledCount_t moleculesubjectKilledCount;
-
   //!> container with all ObservedValues for each atom, associated by id
   ObservedValuesContainer<QtObservedAtom, atomId_t> atomObservedValues;
@@ -151 +139 @@
 
   //!> stored callback function for notifying QtObservedInstanceBoard about subjectKilled in atom
-  boost::function<void (atomId_t)> atomSubjectKilled;
+  boost::function<void (const atomId_t)> atomSubjectKilled;
   //!> stored callback function for notifying QtObservedInstanceBoard about subjectKilled in molecule
-  boost::function<void (moleculeId_t)> moleculeSubjectKilled;
-
+  boost::function<void (const moleculeId_t)> moleculeSubjectKilled;
   //!> note down atom id of last removed atom to drop its ObservedValues
   atomId_t lastremovedatom;

src/UIElements/Qt4/InstanceBoard/QtObservedMolecule.cpp

@@ -132 +132 @@
     owner = NULL;
 
-    board.moleculecountsubjectKilled(getMolIndex());
+    board.returnObservedMolecule(getMolIndex());
   }
 }