Changeset ea7176 for src/Patterns

Timestamp:

Mar 19, 2010, 1:29:01 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:

e0b6fd

Parents:

80c63d

Message:

FIX: Made AtomCount a Cacheable so that the number of atoms in a molecule will always be correct

All unittests working.
All Complete testcases fail.

File:

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

src/Patterns/Cacheable.hpp

@@ -21 +21 @@
     virtual ~Cacheable();
 
-    const bool isValid();
-    const T& operator*();
-    const bool operator==(const T&);
-    const bool operator!=(const T&);
+    const bool isValid() const;
+    const T& operator*() const;
 
     // methods implemented for base-class Observer
@@ -30 +28 @@
     void subjectKilled(Observable *subject);
   private:
-    void checkValid();
+    void checkValid() const;
 
-    T content;
+    mutable T content;
     Observable *owner;
-    bool valid;
-    bool canBeUsed;
+    mutable bool valid;
+    mutable bool canBeUsed;
     boost::function<T()> recalcMethod;
   };
@@ -53 +51 @@
 
   template<typename T>
-  const T& Cacheable<T>::operator*(){
+  const T& Cacheable<T>::operator*() const{
     checkValid();
     return content;
-  }
-
-  template<typename T>
-  const bool Cacheable<T>::operator==(const T& rval){
-    checkValid();
-    return (content == rval);
-  }
-
-  template<typename T>
-  const bool Cacheable<T>::operator!=(const T& rval){
-    checkValid();
-    return (content != rval);
   }
 
@@ -77 +63 @@
 
   template<typename T>
-  const bool Cacheable<T>::isValid(){
+  const bool Cacheable<T>::isValid() const{
     return valid;
   }
@@ -93 +79 @@
 
   template<typename T>
-  void Cacheable<T>::checkValid(){
+  void Cacheable<T>::checkValid() const{
     assert(canBeUsed && "Cacheable used after owner was deleted");
     if(!isValid()){
@@ -107 +93 @@
     virtual ~Cacheable();
 
-    const bool isValid();
-    const T& operator*();
-    const bool operator==(const T&);
-    const bool operator!=(const T&);
+    const bool isValid() const;
+    const T& operator*() const;
 
     // methods implemented for base-class Observer
@@ -126 +110 @@
 
   template<typename T>
-  const T& Cacheable<T>::operator*(){
+  const T& Cacheable<T>::operator*() const{
     return recalcMethod();
-  }
-
-  template<typename T>
-  const bool Cacheable<T>::operator==(const T& rval){
-    return (recalcMethod() == rval);
-  }
-
-  template<typename T>
-  const bool Cacheable<T>::operator!=(const T& rval){
-    return (recalcMethod() != rval);
   }
 
@@ -145 +119 @@
 
   template<typename T>
-  const bool Cacheable<T>::isValid(){
+  const bool Cacheable<T>::isValid() const{
     return true;
   }
@@ -155 +129 @@
 
   template<typename T>
-  void Cacheable<T>::subjectKilled(Observable *subject) {
+  void Cacheable<T>::subjectKilled(Observable *subject){
     assert(0 && "Cacheable::subjectKilled should never be called when caching is disabled");
   }