Changeset 735940 for src/Shapes/ShapeOps.cpp

Timestamp:

Mar 28, 2012, 3:17:38 PM (14 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, Candidate_v1.7.0, 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:

571d04

Parents:

b92e4a

git-author:

Frederik Heber <heber@…> (01/18/12 20:15:48)

git-committer:

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

Message:

FIX: Made practically all Shape... member functions const.

• Shape: isInside(), isOnSurface(), getNormal(), getLineIntersections()
• ShapeOps: translateIn(), translateOut(), translateOutNormal(), isInside().

File:

• src/Shapes/ShapeOps.cpp (modified) (9 diffs)

src/Shapes/ShapeOps.cpp

@@ -34 +34 @@
 ShapeOpsBase_impl::~ShapeOpsBase_impl(){}
 
-bool ShapeOpsBase_impl::isInside(const Vector &point){
+bool ShapeOpsBase_impl::isInside(const Vector &point) const{
   return arg->isInside(translateIn(point));
 }
 
-bool ShapeOpsBase_impl::isOnSurface(const Vector &point){
+bool ShapeOpsBase_impl::isOnSurface(const Vector &point) const{
   return arg->isOnSurface(translateIn(point));
 }
 
-Vector ShapeOpsBase_impl::getNormal(const Vector &point) throw (NotOnSurfaceException){
+Vector ShapeOpsBase_impl::getNormal(const Vector &point) const throw (NotOnSurfaceException){
   Vector helper = translateIn(point);
   if(!arg->isOnSurface(helper)){
@@ -52 +52 @@
 }
 
-LineSegmentSet ShapeOpsBase_impl::getLineIntersections(const Line &line){
+LineSegmentSet ShapeOpsBase_impl::getLineIntersections(const Line &line) const{
   Line newLine(translateIn(line.getOrigin()),translateIn(line.getDirection()));
   LineSegmentSet res(line);
@@ -93 +93 @@
 Resize_impl::~Resize_impl(){}
 
-bool Resize_impl::isInside(const Vector& point){
+bool Resize_impl::isInside(const Vector& point) const{
   return getArg()->isInside((1/size) * point);
 }
 
-Vector Resize_impl::translateIn(const Vector& point){
+Vector Resize_impl::translateIn(const Vector& point) const{
   return (1/size) * point;
 }
 
-Vector Resize_impl::translateOutPos(const Vector& point){
+Vector Resize_impl::translateOutPos(const Vector& point) const{
   return size * point;
 }
 
-Vector Resize_impl::translateOutNormal(const Vector& point){
+Vector Resize_impl::translateOutNormal(const Vector& point) const{
   return point;
 }
@@ -137 +137 @@
 Translate_impl::~Translate_impl(){}
 
-bool Translate_impl::isInside(const Vector& point){
+bool Translate_impl::isInside(const Vector& point) const{
   return getArg()->isInside(point-offset);
 }
 
-Vector Translate_impl::translateIn(const Vector& point){
+Vector Translate_impl::translateIn(const Vector& point) const{
   return point-offset;
 }
 
-Vector Translate_impl::translateOutPos(const Vector& point){
+Vector Translate_impl::translateOutPos(const Vector& point) const{
   return point+offset;
 }
 
-Vector Translate_impl::translateOutNormal(const Vector& point){
+Vector Translate_impl::translateOutNormal(const Vector& point) const{
   return point;
 }
@@ -187 +187 @@
 Stretch_impl::~Stretch_impl(){}
 
-bool Stretch_impl::isInside(const Vector& point){
+bool Stretch_impl::isInside(const Vector& point) const{
   Vector helper=point;
   helper.ScaleAll(reciFactors);
@@ -193 +193 @@
 }
 
-Vector Stretch_impl::translateIn(const Vector& point){
+Vector Stretch_impl::translateIn(const Vector& point) const{
   Vector helper=point;
   helper.ScaleAll(reciFactors);
@@ -199 +199 @@
 }
 
-Vector Stretch_impl::translateOutPos(const Vector& point){
+Vector Stretch_impl::translateOutPos(const Vector& point) const{
   Vector helper=point;
   helper.ScaleAll(factors);
@@ -205 +205 @@
 }
 
-Vector Stretch_impl::translateOutNormal(const Vector& point){
+Vector Stretch_impl::translateOutNormal(const Vector& point) const{
   Vector helper=point;
   // the normalFactors are derived from appearances of the factors
@@ -246 +246 @@
 Transform_impl::~Transform_impl(){}
 
-bool Transform_impl::isInside(const Vector& point){
+bool Transform_impl::isInside(const Vector& point) const{
   return getArg()->isInside(transformationInv * point);
 }
 
-Vector Transform_impl::translateIn(const Vector& point){
+Vector Transform_impl::translateIn(const Vector& point) const{
   return transformationInv * point;
 }
 
-Vector Transform_impl::translateOutPos(const Vector& point){
+Vector Transform_impl::translateOutPos(const Vector& point) const{
   return transformation * point;
 }
 
-Vector Transform_impl::translateOutNormal(const Vector& point){
+Vector Transform_impl::translateOutNormal(const Vector& point) const
+{
   RealSpaceMatrix mat = transformation.invert().transpose();
   return mat * point;