Changeset 6acc2f3 for src/Shapes/Shape_impl.hpp

Timestamp:

Mar 28, 2012, 3:17:38 PM (13 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:

5a8d61

Parents:

84721b

git-author:

Frederik Heber <heber@…> (01/18/12 20:17:24)

git-committer:

Frederik Heber <heber@…> (03/28/12 15:17:38)

Message:

Added getCenter() and getRadius to all Shapes.

• also extended unit test.
• Added test functions to ShapeOpsUnitTest.

File:

• src/Shapes/Shape_impl.hpp (modified) (7 diffs)

src/Shapes/Shape_impl.hpp

@@ -15 +15 @@
 
 
+#include <limits>
 #include <vector>
 
@@ -33 +34 @@
   virtual bool isOnSurface(const Vector &point) const=0;
   virtual Vector getNormal(const Vector &point) const throw(NotOnSurfaceException)=0;
+  virtual Vector getCenter() const=0;
+  virtual double getRadius() const=0;
   virtual LineSegmentSet getLineIntersections(const Line&) const=0;
   virtual std::string toString() const =0;
@@ -49 +52 @@
   virtual Vector getNormal(const Vector &point) const throw(NotOnSurfaceException){
     throw NotOnSurfaceException() << ShapeVector(&point);
+  }
+  virtual Vector getCenter() const {
+    return Vector(0.,0.,0.);
+  }
+  virtual double getRadius() const {
+    return std::numeric_limits<double>::infinity();
   }
   virtual LineSegmentSet getLineIntersections(const Line &line) const{
@@ -77 +86 @@
     throw NotOnSurfaceException() << ShapeVector(&point);
   }
+  virtual Vector getCenter() const {
+    return Vector(0.,0.,0.);
+  }
+  virtual double getRadius() const {
+    return 0.;
+  }
   virtual LineSegmentSet getLineIntersections(const Line &line) const{
     return LineSegmentSet(line);
@@ -99 +114 @@
   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 LineSegmentSet getLineIntersections(const Line&) const;
   virtual std::string toString() const;
@@ -115 +132 @@
   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 LineSegmentSet getLineIntersections(const Line&) const;
   virtual std::string toString() const;
@@ -131 +150 @@
   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 LineSegmentSet getLineIntersections(const Line&) const;
   virtual std::string toString() const;