Changeset 41e287 for src/UIElements/Qt4/InstanceBoard

Timestamp:

Feb 12, 2016, 11:15:23 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:

65c323

Parents:

98c35c

git-author:

Frederik Heber <heber@…> (10/29/15 09:52:10)

git-committer:

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

Message:

Extracted functions handling refcounting of ObservedValues into ObservedValuesContainer.

• this avoids a lot of code duplication.

Location:

src/UIElements/Qt4/InstanceBoard

Files:

• ObservedValuesContainer.hpp (added)
• ObservedValuesContainer_impl.hpp (added)
• QtObservedAtom.hpp (modified) (2 diffs)
• QtObservedInstanceBoard.cpp (modified) (12 diffs)
• QtObservedInstanceBoard.hpp (modified) (3 diffs)
• QtObservedMolecule.hpp (modified) (2 diffs)

src/UIElements/Qt4/InstanceBoard/QtObservedAtom.hpp

@@ -23 +23 @@
 
 #include "UIElements/Qt4/InstanceBoard/ObservedValue_types.hpp"
+#include "UIElements/Qt4/InstanceBoard/ObservedValuesContainer.hpp"
 #include "types.hpp"
 
@@ -41 +42 @@
   Q_OBJECT
 
+  //!> ObservedValuesContainer needs to access private cstor and dstor
+  friend class ObservedValuesContainer<QtObservedAtom, atomId_t>;
   //!> QtObservedInstanceBoard needs to access private cstor and dstor
   friend class QtObservedInstanceBoard;

src/UIElements/Qt4/InstanceBoard/QtObservedInstanceBoard.cpp

@@ -47 +47 @@
 #include "Descriptors/MoleculeIdDescriptor.hpp"
 #include "molecule.hpp"
+#include "UIElements/Qt4/InstanceBoard/ObservedValuesContainer_impl.hpp"
 #include "World.hpp"
 
@@ -53 +54 @@
   Observer("QtObservedInstanceBoard"),
   WorldSignedOn(false),
+  atomObservedValues("atom"),
+  moleculeObservedValues("molecule"),
   atomSubjectKilled(
       boost::bind(&QtObservedInstanceBoard::atomcountsubjectKilled, this, _1)),
@@ -139 +142 @@
               moleculeSubjectKilled);
 #ifndef NDEBUG
-          std::pair<moleculeObservedValues_t::iterator, bool> inserter =
+          bool status =
 #endif
-              moleculeObservedValues.insert(
-                  std::make_pair( _id, std::make_pair(ObservedValues,0) ));
-          ASSERT( inserter.second,
+              moleculeObservedValues.insert(_id, ObservedValues);
+          ASSERT( status,
               "QtObservedInstanceBoard::recieveNotification() - could not insert ObservedValues for"
               +toString(_id)+".");
@@ -187 +189 @@
               atomSubjectKilled);
 #ifndef NDEBUG
-          std::pair<atomObservedValues_t::iterator, bool> inserter =
+          bool status  =
 #endif
-              atomObservedValues.insert(
-                  std::make_pair( _id, std::make_pair(ObservedValues,0) ));
-          ASSERT( inserter.second,
+              atomObservedValues.insert(_id, ObservedValues);
+          ASSERT( status,
               "QtObservedInstanceBoard::recieveNotification() - could not insert ObservedValues for"
               +toString(_id)+".");
@@ -227 +228 @@
               << atomid << " from molecule " << molid);
           // check whether atom's observedvalues are present
-          ASSERT( atomObservedValues.find(atomid) != atomObservedValues.end(),
+          ASSERT( atomObservedValues.isPresent(atomid),
               "QtObservedInstanceBoard::recieveNotification() - ObservedValues for atom "
               +toString(atomid)+" are not present yet.");
@@ -255 +256 @@
         const moleculeId_t newmoleculeId = dynamic_cast<molecule *>(publisher)->getId();
         LOG(3, "DEBUG: InformationBoard got IndexChanged from molecule " << molid << " to " << newmoleculeId);
-        {
-          moleculeObservedValues_t::iterator iter = moleculeObservedValues.find(molid);
-          // change id here only if still present
-          if (iter != moleculeObservedValues.end()) {
-            RefCountedObservedValues_t obsvalues = iter->second;
-            moleculeObservedValues.erase(iter);
-            ASSERT( moleculeObservedValues.find(newmoleculeId) == moleculeObservedValues.end(),
-                "QtObservedInstanceBoard::recieveNotification() - ObservedValues for atom "
-                +toString(newmoleculeId)+" already present.");
-            moleculeObservedValues.insert( std::make_pair(newmoleculeId, obsvalues) );
-        //    if (!inserter.second)
-        //      ELOG(1, "QtInformationBoard could not insert molecule id change "
-        //          << molid << "->" << newmoleculeId);
-          }
-        }
+#ifndef NDEBUG
+        bool status =
+#endif
+        moleculeObservedValues.changeIdentifier(molid, newmoleculeId);
+        ASSERT( status,
+            "QtObservedInstanceBoard::recieveNotification() - cannot change molecule's id "
+            +toString(molid)+" "+toString(newmoleculeId)+" in moleculeObservedValues.");
         // no need update SignedOn, ref does not change
         emit moleculeIndexChanged(molid, newmoleculeId);
@@ -285 +278 @@
         const atomId_t newatomId = dynamic_cast<atom *>(publisher)->getId();
         LOG(3, "DEBUG: InformationBoard got IndexChanged from atom " << oldatomId << " to " << newatomId);
-        // update atomObservedValues
-        {
-          atomObservedValues_t::iterator iter = atomObservedValues.find(oldatomId);
-          // change id here only if still present
-          if (iter != atomObservedValues.end()) {
-            RefCountedObservedValues_t obsvalues = iter->second;
-            atomObservedValues.erase(iter);
-            ASSERT( atomObservedValues.find(newatomId) == atomObservedValues.end(),
-                "QtObservedInstanceBoard::recieveNotification() - ObservedValues for atom "
-                +toString(newatomId)+" already present.");
-            atomObservedValues.insert( std::make_pair(newatomId, obsvalues) );
-      //    if (!inserter.second)
-      //      ELOG(1, "QtInformationBoard could not insert atom id change "
-      //          << oldatomId << "->" << newatomId);
-          }
-        }
+        atomObservedValues.changeIdentifier(oldatomId, newatomId);
         // no need update SignedOn, ref does not change
         emit atomIndexChanged(oldatomId, newatomId);
@@ -326 +304 @@
 
   if (iter->second > GLMoleculeObject_atom::MAX_ObservedTypes) {
-    ASSERT( atomObservedValues[_atomid].second == 0,
+    ASSERT( atomObservedValues.getRefCount(_atomid) == 0,
         "QtObservedInstanceBoard::atomcountsubjectKilled() - observed Values for atom "
         +toString(_atomid)+" are still being held somewhere.");
@@ -350 +328 @@
 
   if (iter->second > GLMoleculeObject_molecule::MAX_ObservedTypes) {
-    ASSERT( moleculeObservedValues[_molid].second == 0,
+    ASSERT( moleculeObservedValues.getRefCount(_molid) == 0,
         "QtObservedInstanceBoard::moleculecountsubjectKilled() - observed Values for molecule "
         +toString(_molid)+" are still being held somewhere.");
@@ -359 +337 @@
 }
 
-ObservedValues_t
-QtObservedInstanceBoard::getAtomObservedValues(const atomId_t _id)
-{
-  ObservedValues_t returnvalues;
-  const atomObservedValues_t::iterator iter = atomObservedValues.find(_id);
-  ASSERT(iter != atomObservedValues.end(),
-      "QtObservedInstanceBoard::getAtomObservedValues() - atom values not present for id"
-      +toString(_id));
-  if (iter->first == _id) {
-    returnvalues = iter->second.first;
-    atomObservedValues.erase(iter);
-  }
-  return returnvalues;
-}
-
-ObservedValues_t
-QtObservedInstanceBoard::getMoleculeObservedValues(const moleculeId_t _id)
-{
-  ObservedValues_t returnvalues;
-  const moleculeObservedValues_t::iterator iter = moleculeObservedValues.find(_id);
-  ASSERT(iter != moleculeObservedValues.end(),
-      "getMoleculeObservedValues::getAtomObservedValues() - molecule values not present for id"
-      +toString(_id));
-  if (iter->first == _id) {
-    returnvalues = iter->second.first;
-    moleculeObservedValues.erase(iter);
-  }
-  return returnvalues;
+QtObservedAtom::ptr QtObservedInstanceBoard::getObservedAtom(const atomId_t _id)
+{
+  return atomObservedValues.get(_id);
+}
+
+QtObservedMolecule::ptr QtObservedInstanceBoard::getObservedMolecule(const moleculeId_t _id)
+{
+  return moleculeObservedValues.get(_id);
+}
+
+void QtObservedInstanceBoard::returnObservedAtom(const atomId_t _id)
+{
+  atomObservedValues.yield(_id);
+}
+
+void QtObservedInstanceBoard::returnObservedMolecule(const moleculeId_t _id)
+{
+  moleculeObservedValues.yield(_id);
+}
+
+ObservedValues_t QtObservedInstanceBoard::getAtomObservedValues(const atomId_t _id)
+{
+  return atomObservedValues.getObservedValues(_id);
+}
+ObservedValues_t QtObservedInstanceBoard::getMoleculeObservedValues(const moleculeId_t _id)
+{
+  return moleculeObservedValues.getObservedValues(_id);
 }
 
@@ -394 +371 @@
 {
   if (lastremovedatom != _id) {
-#ifndef NDEBUG
-    std::pair<atomObservedValues_t::iterator, bool> inserter =
-#endif
-        atomObservedValues.insert(
-            std::make_pair( _id, std::make_pair(_observedvalues,0) ) );
-    ASSERT( inserter.second,
-        "QtObservedInstanceBoard::returnAtomObservedValues() - could not insert ObservedValues for"
-        +toString(_id)+".");
-  } else
+    atomObservedValues.returnObservedValues(_id, _observedvalues);
+  } else {
     lastremovedatom = (atomId_t)-1;
+    atomObservedValues.erase(_id);
+  }
 }
 
@@ -411 +383 @@
 {
   if (lastremovedmolecule != _id) {
-#ifndef NDEBUG
-      std::pair<moleculeObservedValues_t::iterator, bool> inserter =
-#endif
-          moleculeObservedValues.insert(
-              std::make_pair( _id, std::make_pair(_observedvalues,0) ) );
-      ASSERT( inserter.second,
-          "QtObservedInstanceBoard::returnMoleculeObservedValues() - could not insert ObservedValues for"
-          +toString(_id)+".");
-  } else
+    moleculeObservedValues.returnObservedValues(_id, _observedvalues);
+  } else {
     lastremovedmolecule = (moleculeId_t)-1;
-}
-
-QtObservedAtom::ptr QtObservedInstanceBoard::getObservedAtom(const atomId_t _id)
-{
-  atomObservedValues_t::iterator iter = atomObservedValues.find(_id);
-  ASSERT( iter != atomObservedValues.end(),
-      "QtObservedInstanceBoard::getObservedAtom() - no observed values present for atom "
-      +toString(_id));
-  const ObservedValues_t &obsvalues = iter->second.first;
-  // increase refcount
-  ++(iter->second.second);
-  QtObservedAtom::ptr _atom(new QtObservedAtom(obsvalues));
-
-  return _atom;
-}
-
-QtObservedMolecule::ptr QtObservedInstanceBoard::getObservedMolecule(const moleculeId_t _id)
-{
-  moleculeObservedValues_t::iterator iter = moleculeObservedValues.find(_id);
-  ASSERT( iter != moleculeObservedValues.end(),
-      "QtObservedInstanceBoard::getObservedMolecule() - no observed values present for molecule "
-      +toString(_id));
-  const ObservedValues_t &obsvalues = iter->second.first;
-  // increase refcount
-  ++(iter->second.second);
-  QtObservedMolecule::ptr _molecule(new QtObservedMolecule(obsvalues));
-
-  return _molecule;
-}
-
-void QtObservedInstanceBoard::returnObservedAtom(const atomId_t _id)
-{
-  atomObservedValues_t::iterator iter = atomObservedValues.find(_id);
-  ASSERT( iter != atomObservedValues.end(),
-      "QtObservedInstanceBoard::returnObservedAtom() - no observed values present for atom "
-      +toString(_id));
-  ASSERT( iter->second.second != 0,
-      "QtObservedInstanceBoard::returnObservedAtom() - all ObservedAtoms for atom "
-      +toString(_id)+" have already been returned.");
-  // decrease refcount
-  --(iter->second.second);
-  if (iter->second.second == 0) {
-    // free instance
-  }
-}
-
-void QtObservedInstanceBoard::returnObservedMolecule(const moleculeId_t _id)
-{
-  moleculeObservedValues_t::iterator iter = moleculeObservedValues.find(_id);
-  ASSERT( iter != moleculeObservedValues.end(),
-      "QtObservedInstanceBoard::returnObservedMolecule() - no observed values present for molecule "
-      +toString(_id));
-  ASSERT( iter->second.second != 0,
-      "QtObservedInstanceBoard::returnObservedMolecule() - all ObservedMolecules for molecule "
-      +toString(_id)+" have already been returned.");
-  // decrease refcount
-  --(iter->second.second);
-  if (iter->second.second == 0) {
-    // free instance
-  }
-}
-
+    moleculeObservedValues.erase(_id);
+  }
+}
+

src/UIElements/Qt4/InstanceBoard/QtObservedInstanceBoard.hpp

@@ -26 +26 @@
 
 #include "UIElements/Qt4/InstanceBoard/ObservedValue_types.hpp"
+#include "UIElements/Qt4/InstanceBoard/ObservedValuesContainer.hpp"
 #include "types.hpp"
 
@@ -81 +82 @@
   QtObservedAtom::ptr getObservedAtom(const atomId_t _id);
   QtObservedMolecule::ptr getObservedMolecule(const moleculeId_t _id);
+  void returnObservedAtom(const atomId_t _id);
+  void returnObservedMolecule(const moleculeId_t _id);
 
   ObservedValues_t getAtomObservedValues(const atomId_t _id);
   ObservedValues_t getMoleculeObservedValues(const moleculeId_t _id);
-
-  void returnObservedAtom(const atomId_t _id);
-  void returnObservedMolecule(const moleculeId_t _id);
 
   void returnAtomObservedValues(const atomId_t _id, ObservedValues_t &_observedvalues);
@@ -146 +146 @@
   moleculesubjectKilledCount_t moleculesubjectKilledCount;
 
-  typedef std::pair<ObservedValues_t, size_t> RefCountedObservedValues_t;
-
-  //!> typedef for the map of id to each one's ObservedValues
-  typedef typename std::map<atomId_t, RefCountedObservedValues_t> atomObservedValues_t;
-  //!> map containing all ObservedValues for each atom, associated by id
-  atomObservedValues_t atomObservedValues;
-
-  //!> typedef for the map of id to each one's ObservedValues
-  typedef typename std::map<moleculeId_t, RefCountedObservedValues_t> moleculeObservedValues_t;
-  //!> map containing all ObservedValues for each molecule, associated by id
-  moleculeObservedValues_t moleculeObservedValues;
+  //!> container with all ObservedValues for each atom, associated by id
+  ObservedValuesContainer<QtObservedAtom, atomId_t> atomObservedValues;
+  //!> container with all ObservedValues for each molecule, associated by id
+  ObservedValuesContainer<QtObservedMolecule, moleculeId_t> moleculeObservedValues;
 
   //!> stored callback function for notifying QtObservedInstanceBoard about subjectKilled in atom

src/UIElements/Qt4/InstanceBoard/QtObservedMolecule.hpp

@@ -22 +22 @@
 
 #include "UIElements/Qt4/InstanceBoard/ObservedValue_types.hpp"
+#include "UIElements/Qt4/InstanceBoard/ObservedValuesContainer.hpp"
 #include "types.hpp"
 
@@ -40 +41 @@
   Q_OBJECT
 
+  //!> ObservedValuesContainer needs to access private cstor and dstor
+  friend class ObservedValuesContainer<QtObservedMolecule, moleculeId_t>;
   //!> QtObservedInstanceBoard needs to access private cstor and dstor
   friend class QtObservedInstanceBoard;