Changeset adc42b for src/Patterns/Cacheable.hpp

Timestamp:

Mar 19, 2010, 4:55:28 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:

ce1d8c

Parents:

4fb5a3

git-author:

Tillmann Crueger <crueger@…> (03/19/10 16:24:47)

git-committer:

Tillmann Crueger <crueger@…> (03/19/10 16:55:28)

Message:

Made the cacheable always recalculate when the owner is in the process of updating
(cherry picked from commit 6234ef6106a5d0b8c1d29976e4e4304c66bb5c8b)

File:

• src/Patterns/Cacheable.hpp (modified) (8 diffs)

src/Patterns/Cacheable.hpp

@@ -25 +25 @@
     public:
       State(Cacheable *_owner) :
-        owner(_owner),
-        busy(false)
-        {}
-      virtual T& getValue()=0;
+        busy(false),
+        owner(_owner)
+        {}
+      virtual T getValue()=0;
       virtual void invalidate()=0;
       virtual bool isValid()=0;
@@ -46 +46 @@
         {}
 
-      virtual T& getValue(){
+      virtual T getValue(){
         // set the state to valid
         State::owner->switchState(State::owner->validState);
@@ -72 +72 @@
         {}
 
-      virtual T& getValue(){
+      virtual T getValue(){
         return content;
       }
@@ -100 +100 @@
         {}
 
-      virtual T& getValue(){
+      virtual T getValue(){
         ASSERT(0,"Cannot get a value from a Cacheable after it's Observable has died");
         // we have to return a grossly invalid reference, because no value can be produced anymore
@@ -128 +128 @@
 
     const bool isValid() const;
-    const T& operator*() const;
+    const T operator*() const;
 
     // methods implemented for base-class Observer
@@ -173 +173 @@
 
   template<typename T>
-  const T& Cacheable<T>::operator*() const{
-    return state->getValue();
+  const T Cacheable<T>::operator*() const{
+    // we can only use the cacheable when the owner is not changing at the moment
+    if(!owner->isBlocked()){
+      return state->getValue();
+    }
+    else{
+      return recalcMethod();
+    }
   }
 
@@ -215 +221 @@
 
     const bool isValid() const;
-    const T& operator*() const;
+    const T operator*() const;
 
     // methods implemented for base-class Observer
@@ -231 +237 @@
 
   template<typename T>
-  const T& Cacheable<T>::operator*() const{
+  const T Cacheable<T>::operator*() const{
     return recalcMethod();
   }