Changeset 393342 for src/UIElements

Timestamp:

Feb 14, 2016, 12:34:26 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:

6bce88

Parents:

0af22d

git-author:

Frederik Heber <heber@…> (12/30/15 18:42:38)

git-committer:

Frederik Heber <heber@…> (02/14/16 12:34:26)

Message:

FIX: ObservesValuesContainer uses internal struct for two iterators for observedvalues.

• we need these two additional iterators (apart from the deque) in order to step through the created instances one-by-one as they are expected in this manner by the QtGUI which, though lacking behind, is trying to process all the seen events.

Location:

src/UIElements/Qt4/InstanceBoard

Files:

• ObservedValuesContainer.hpp (modified) (1 diff)
• ObservedValuesContainer_impl.hpp (modified) (8 diffs)

src/UIElements/Qt4/InstanceBoard/ObservedValuesContainer.hpp

@@ -102 +102 @@
    */
 
-  typedef std::deque<std::pair<typename T::ptr, size_t> > RefCountedObservedValues_t;
-  typedef std::map<id, RefCountedObservedValues_t > CountedObservedValues_t;
+  /** Structure to contain the sequence of created observed memories.
+   *
+   * \note QtGUI may lag behind the creation/destruction of observed instances a
+   * lot but one after the other must be served. Here, we keep an additional
+   * iterator that indicates the current instance to be served.
+   */
+  struct RefCountedObserved
+  {
+    typedef std::pair<typename T::ptr, size_t> Value_t;
+    typedef std::deque<Value_t> Values_t;
+
+    /** Default cstor of RefCountedObservedValues.
+     *
+     * Make sure that currentvalue has some sensible default value.
+     */
+    RefCountedObserved() :
+      tobedestroyed(values.end()),
+      currentvalue(values.end())
+    {}
+
+    /** Default copy cstor of RefCountedObservedValues.
+     *
+     * \param _instance instance to copy
+     */
+    RefCountedObserved(const RefCountedObserved & _instance) :
+      values(_instance.values),
+      tobedestroyed(values.begin()),
+      currentvalue(values.begin())
+    {}
+
+    /** Cstor of RefCountedObservedValues.
+     *
+     * Make sure that currentvalue has some sensible default value.
+     *
+     * \param _value initial value for the list
+     */
+    RefCountedObserved(Value_t _value) :
+      values(1, _value),
+      tobedestroyed(values.begin()),
+      currentvalue(values.begin())
+    {}
+
+    bool empty() const
+    {
+      return values.empty();
+    }
+
+    void push_back(Value_t _value)
+    {
+      values.push_back(_value);
+      if (currentvalue == values.end())
+        currentvalue = values.end()--;
+      if (tobedestroyed == values.end())
+        tobedestroyed = currentvalue;
+    }
+
+    Value_t& getCurrentValue() const
+    {
+      ASSERT (currentvalue != values.end(),
+          "RefCountedObservedValues::getCurrentValue() - cannot get, no values present.");
+      return *currentvalue;
+    }
+
+    Value_t& getEraseCandidate() const
+    {
+      ASSERT (tobedestroyed != values.end(),
+          "RefCountedObservedValues::getCurrentValue() - cannot get, no values present.");
+      return *tobedestroyed;
+    }
+
+    void eraseCurrentValue()
+    {
+      ASSERT (tobedestroyed != values.end(),
+          "RefCountedObservedValues::eraseCurrentValue() - cannot erase, no values present.");
+      if (tobedestroyed == currentvalue)
+        ++currentvalue;
+      values.erase(tobedestroyed);
+      tobedestroyed = currentvalue;
+      // removal of this instance when both iterators point to end is done inside QtObservedInstanceBoard
+    }
+
+    //!> set of values
+    Values_t values;
+    //!> iterator on the value that is next gonna be destroyed
+    typename Values_t::iterator tobedestroyed;
+    //!> iterator on the current value that is served on get
+    typename Values_t::iterator currentvalue;
+  };
+
+  typedef std::map<id, RefCountedObserved > CountedObservedValues_t;
   //!> internal vector of observed values
   CountedObservedValues_t ObservedValues;

src/UIElements/Qt4/InstanceBoard/ObservedValuesContainer_impl.hpp

@@ -37 +37 @@
         "~ObservedValuesContainer() of "+NameOfType+" "+toString(iter->first)
         +" has an empty list in ObservedValues.");
-    for (typename RefCountedObservedValues_t::iterator listiter = iter->second.begin();
-        listiter != iter->second.end(); ++listiter) {
+    for (typename RefCountedObserved::Values_t::iterator listiter = iter->second.values.begin();
+        listiter != iter->second.values.end(); ++listiter) {
       listiter->first->noteBoardIsGone();
     }
@@ -51 +51 @@
       "ObservedValuesContainer::getObservedValues() - no observed values present for "
       +NameOfType+" "+toString(_id));
-  ASSERT( !iter->second.empty(),
-      "ObservedValuesContainer<T,id>::get() of "+NameOfType+" "+toString(_id)
-      +" has an empty list in ObservedValues.");
-  const typename T::ptr &obsvalues = iter->second.back().first;
-
-  return obsvalues;
+  return iter->second.getCurrentValue().first;
 }
 
@@ -65 +60 @@
   LOG(3, "DEBUG: ObservedValuesContainer got markObservedValuesAsConnected() for an observed value of "
       << NameOfType << " " << _id);
- typename CountedObservedValues_t::iterator iter = ObservedValues.find(_id);
+  typename CountedObservedValues_t::iterator iter = ObservedValues.find(_id);
   ASSERT (iter != ObservedValues.end(),
       "ObservedValuesContainer<T,id>::markObservedValuesAsConnected() - Observed value of "
       +NameOfType+" "+toString(_id)+" is not present yet.");
-  ASSERT( !iter->second.empty(),
-      "ObservedValuesContainer<T,id>::markObservedValuesAsConnected() of "+NameOfType
-      +" "+toString(_id)+" has an empty list in ObservedValues.");
-  ++(iter->second.back().second);
+  ++(iter->second.getCurrentValue().second);
 }
 
@@ -80 +72 @@
 {
   typename CountedObservedValues_t::const_iterator iter = ObservedValues.find(_id);
-  ASSERT( !iter->second.empty(),
-      "ObservedValuesContainer<T,id>::checkRefCount() of "+NameOfType
-      +" "+toString(_id)+" has an empty list in ObservedValues.");
-  return ((iter != ObservedValues.end()) && (iter->second.front().second == 0));
+  return ((iter != ObservedValues.end()) && (iter->second.getEraseCandidate().second == 0));
 }
 
@@ -96 +85 @@
       "ObservedValuesContainer<T,id>::markObservedValuesAsDisconnected() - Observed value of "
       +NameOfType+" "+toString(_id)+" is not present yet.");
-  ASSERT( !iter->second.empty(),
-      "ObservedValuesContainer<T,id>::markObservedValuesAsDisconnected() of "+NameOfType
-      +" "+toString(_id)+" has an empty list in ObservedValues.");
-  ASSERT (iter->second.front().second != 0,
+  ASSERT (iter->second.getEraseCandidate().second != 0,
       "ObservedValuesContainer<T,id>::markObservedValuesAsDisconnected() - Observed value of "
       +NameOfType+" "+toString(_id)+" is already signOff() from all.");
-  --(iter->second.front().second);
+  --(iter->second.getEraseCandidate().second);
 
   if (checkRefCount(_id) && checksubjectKilled(_id) && checkMarkedForErase(_id))
@@ -144 +130 @@
   subjectKilledCount.erase(_id);
   typename CountedObservedValues_t::iterator iter = ObservedValues.find(_id);
-  ASSERT( !iter->second.empty(),
-      "ObservedValuesContainer<T,id>::removeObservedValues() of "+NameOfType
-      +" for "+toString(_id)+" has an empty list in ObservedValues.");
-  if (iter->second.size() == 1)
+  iter->second.eraseCurrentValue();
+  if (iter->second.empty())
     ObservedValues.erase(iter);
-  else {
-    //if more than one, erase always the first one
-    iter->second.pop_front();
-  }
   MarkedForErase.erase(_id);
 }
@@ -180 +160 @@
 void ObservedValuesContainer<T,id>::insert(const id _id, const typename T::ptr &_obsvalues)
 {
-  std::pair<typename CountedObservedValues_t::iterator, bool> inserter =
-      ObservedValues.insert(
-          std::make_pair( _id, RefCountedObservedValues_t(1,std::make_pair(_obsvalues,0)) ) );
-  if (!inserter.second) {
+  typename ObservedValuesContainer<T,id>::RefCountedObserved::Value_t value(std::make_pair(_obsvalues,0));
+  typename CountedObservedValues_t::iterator iter = ObservedValues.find(_id);
+  if (iter == ObservedValues.end()) {
+    std::pair<typename CountedObservedValues_t::iterator, bool> inserter =
+        ObservedValues.insert(
+            std::make_pair( _id, RefCountedObserved(value) ) );
+    ASSERT( inserter.second,
+        "ObservedValuesContainer<T,id>::insert() of "+NameOfType
+        +" for "+toString(_id)+", insertion failed though empty?");
+  } else {
+    ASSERT( !iter->second.empty(),
+        "ObservedValuesContainer<T,id>::insert() of "+NameOfType
+        +" for "+toString(_id)+" has an empty list in ObservedValues.");
     // already an entry present? add to deque
-    inserter.first->second.push_back( std::make_pair(_obsvalues,0) );
+    iter->second.push_back( value );
   }
   _obsvalues->activateObserver();
@@ -210 +199 @@
       // whether changing ids "there" is possible when the QtObserved... is under
       // removal.
-      RefCountedObservedValues_t obsvalues = Colditer->second;
+      ObservedValuesContainer<T,id>::RefCountedObserved obsvalues = Colditer->second;
       ObservedValues.erase(Colditer);
       ObservedValues.insert( std::make_pair(_newid, obsvalues) );