Ignore:
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:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • src/Shapes/Shape_impl.hpp

    rb92e4a r735940  
    3030  Shape_impl(){};
    3131  virtual ~Shape_impl(){};
    32   virtual bool isInside(const Vector &point)=0;
    33   virtual bool isOnSurface(const Vector &point)=0;
    34   virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException)=0;
    35   virtual LineSegmentSet getLineIntersections(const Line&)=0;
     32  virtual bool isInside(const Vector &point) const=0;
     33  virtual bool isOnSurface(const Vector &point) const=0;
     34  virtual Vector getNormal(const Vector &point) const throw(NotOnSurfaceException)=0;
     35  virtual LineSegmentSet getLineIntersections(const Line&) const=0;
    3636  virtual std::string toString() const =0;
    3737  virtual enum ShapeType getType() const =0;
    … …  
    4141class Everywhere_impl : public Shape_impl {
    4242public:
    43   virtual bool isInside(const Vector &point){
     43  virtual bool isInside(const Vector &point) const{
    4444    return true;
    4545  }
    46   virtual bool isOnSurface(const Vector &point){
     46  virtual bool isOnSurface(const Vector &point) const{
    4747    return false;
    4848  }
    49   virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException){
     49  virtual Vector getNormal(const Vector &point) const throw(NotOnSurfaceException){
    5050    throw NotOnSurfaceException() << ShapeVector(&point);
    5151  }
    52   virtual LineSegmentSet getLineIntersections(const Line &line){
     52  virtual LineSegmentSet getLineIntersections(const Line &line) const{
    5353    LineSegmentSet res(line);
    5454    res.insert(LineSegment(line.negEndpoint(),line.posEndpoint()));
    … …  
    6868
    6969class Nowhere_impl : public Shape_impl {
    70   virtual bool isInside(const Vector &point){
     70  virtual bool isInside(const Vector &point) const{
    7171    return false;
    7272  }
    73   virtual bool isOnSurface(const Vector &point){
     73  virtual bool isOnSurface(const Vector &point) const{
    7474    return false;
    7575  }
    76   virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException){
     76  virtual Vector getNormal(const Vector &point) const throw(NotOnSurfaceException){
    7777    throw NotOnSurfaceException() << ShapeVector(&point);
    7878  }
    79   virtual LineSegmentSet getLineIntersections(const Line &line){
     79  virtual LineSegmentSet getLineIntersections(const Line &line) const{
    8080    return LineSegmentSet(line);
    8181  }
    … …  
    9696  AndShape_impl(const Shape::impl_ptr&, const Shape::impl_ptr&);
    9797  virtual ~AndShape_impl();
    98   virtual bool isInside(const Vector &point);
    99   virtual bool isOnSurface(const Vector &point);
    100   virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException);
    101   virtual LineSegmentSet getLineIntersections(const Line&);
     98  virtual bool isInside(const Vector &point) const;
     99  virtual bool isOnSurface(const Vector &point) const;
     100  virtual Vector getNormal(const Vector &point) const throw(NotOnSurfaceException);
     101  virtual LineSegmentSet getLineIntersections(const Line&) const;
    102102  virtual std::string toString() const;
    103103  virtual enum ShapeType getType() const;
    … …  
    112112  OrShape_impl(const Shape::impl_ptr&, const Shape::impl_ptr&);
    113113  virtual ~OrShape_impl();
    114   virtual bool isInside(const Vector &point);
    115   virtual bool isOnSurface(const Vector &point);
    116   virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException);
    117   virtual LineSegmentSet getLineIntersections(const Line&);
     114  virtual bool isInside(const Vector &point) const;
     115  virtual bool isOnSurface(const Vector &point) const;
     116  virtual Vector getNormal(const Vector &point) const throw(NotOnSurfaceException);
     117  virtual LineSegmentSet getLineIntersections(const Line&) const;
    118118  virtual std::string toString() const;
    119119  virtual enum ShapeType getType() const;
    … …  
    128128  NotShape_impl(const Shape::impl_ptr&);
    129129  virtual ~NotShape_impl();
    130   virtual bool isInside(const Vector &point);
    131   virtual bool isOnSurface(const Vector &point);
    132   virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException);
    133   virtual LineSegmentSet getLineIntersections(const Line&);
     130  virtual bool isInside(const Vector &point) const;
     131  virtual bool isOnSurface(const Vector &point) const;
     132  virtual Vector getNormal(const Vector &point) const throw(NotOnSurfaceException);
     133  virtual LineSegmentSet getLineIntersections(const Line&) const;
    134134  virtual std::string toString() const;
    135135  virtual enum ShapeType getType() const;
Note: See TracChangeset for help on using the changeset viewer.