Changeset f06cbb for src

Timestamp:

Sep 19, 2013, 8:24:28 PM (11 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:

aeb694

Parents:

52bb5a

git-author:

Frederik Heber <heber@…> (08/30/13 22:32:37)

git-committer:

Frederik Heber <heber@…> (09/19/13 20:24:28)

Message:

AndShape and OrShape now use Cacheable to store center and radius once calculated.

• otherwise we might have to traverse a huge tree all the time when actually the shape cannot change and hence a once determined center is always true.
• getRadius() and getCenter() functionality moved into private functions calculate...().

Location:

src/Shapes

Files:

• Shape.cpp (modified) (8 diffs)
• Shape_impl.hpp (modified) (5 diffs)

src/Shapes/Shape.cpp

@@ -46 +46 @@
 #include "Tesselation/ApproximateShapeVolume.hpp"
 
+#include <boost/bind.hpp>
 #include <algorithm>
 #include <limits>
@@ -152 +153 @@
 }
 
-std::string Shape::toString() const{
+std::string Shape::toString() const {
   return impl->toString();
 }
@@ -186 +187 @@
 
 AndShape_impl::AndShape_impl(const Shape::impl_ptr &_lhs, const Shape::impl_ptr &_rhs) :
-  lhs(_lhs),rhs(_rhs)
+  lhs(_lhs),
+  rhs(_rhs),
+  radius(NULL, boost::bind(&AndShape_impl::calculateRadius, this), "radius"),
+  center(NULL, boost::bind(&AndShape_impl::calculateCenter, this), "center")
 {}
 
@@ -238 +242 @@
 }
 
-Vector AndShape_impl::getCenter() const
+Vector AndShape_impl::calculateCenter() const
 {
   // calculate closest position on sphere surface to other center ..
@@ -247 +251 @@
 }
 
-double AndShape_impl::getRadius() const
+double AndShape_impl::calculateRadius() const
 {
   const double distance = (lhs->getCenter() - rhs->getCenter()).Norm();
@@ -314 +318 @@
 
 OrShape_impl::OrShape_impl(const Shape::impl_ptr &_lhs, const Shape::impl_ptr &_rhs) :
-  lhs(_lhs),rhs(_rhs)
+  lhs(_lhs),
+  rhs(_rhs),
+  radius(NULL, boost::bind(&OrShape_impl::calculateRadius, this), "radius"),
+  center(NULL, boost::bind(&OrShape_impl::calculateCenter, this), "center")
 {}
 
@@ -366 +373 @@
 }
 
-Vector OrShape_impl::getCenter() const
+Vector OrShape_impl::calculateCenter() const
 {
   // calculate furthest position on sphere surface to other center ..
@@ -375 +382 @@
 }
 
-double OrShape_impl::getRadius() const
+double OrShape_impl::calculateRadius() const
 {
   const Vector rhsDistance = rhs->getCenter() + rhs->getRadius()*((rhs->getCenter() - lhs->getCenter()).getNormalized());

src/Shapes/Shape_impl.hpp

@@ -28 +28 @@
 #include "LinearAlgebra/LineSegmentSet.hpp"
 #include "LinearAlgebra/Vector.hpp"
+
+#include "CodePatterns/Cacheable.hpp"
 
 
@@ -146 +148 @@
   virtual bool isOnSurface(const Vector &point) const;
   virtual Vector getNormal(const Vector &point) const throw(NotOnSurfaceException);
-  virtual Vector getCenter() const;
-  virtual double getRadius() const;
+  virtual Vector getCenter() const
+  { return *center; }
+  virtual double getRadius() const
+  { return *radius; }
   virtual double getVolume() const;
   virtual double getSurfaceArea() const;
@@ -156 +160 @@
   virtual std::vector<Vector> getHomogeneousPointsInVolume(const size_t N) const;
 private:
+  double calculateRadius() const;
+  Vector calculateCenter() const;
+
   Shape::impl_ptr lhs;
   Shape::impl_ptr rhs;
+  Cacheable<double> radius;
+  Cacheable<Vector> center;
 };
 
@@ -167 +176 @@
   virtual bool isOnSurface(const Vector &point) const;
   virtual Vector getNormal(const Vector &point) const throw(NotOnSurfaceException);
-  virtual Vector getCenter() const;
-  virtual double getRadius() const;
+  virtual Vector getCenter() const
+  { return *center; }
+  virtual double getRadius() const
+  { return *radius; }
   virtual double getVolume() const;
   virtual double getSurfaceArea() const;
@@ -177 +188 @@
   virtual std::vector<Vector> getHomogeneousPointsInVolume(const size_t N) const;
 private:
+  double calculateRadius() const;
+  Vector calculateCenter() const;
+
   Shape::impl_ptr lhs;
   Shape::impl_ptr rhs;
+  Cacheable<double> radius;
+  Cacheable<Vector> center;
 };