Changeset 735940 for src


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().
Location:
src/Shapes
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • src/Shapes/BaseShapes.cpp

    rb92e4a r735940  
    3737#include <algorithm>
    3838
    39 bool Sphere_impl::isInside(const Vector &point){
    40   return point.NormSquared()<=1;
    41 }
    42 
    43 bool Sphere_impl::isOnSurface(const Vector &point){
    44   return fabs(point.NormSquared()-1)<MYEPSILON;
    45 }
    46 
    47 Vector Sphere_impl::getNormal(const Vector &point) throw(NotOnSurfaceException){
     39bool Sphere_impl::isInside(const Vector &point) const{
     40  return point.NormSquared()<=1.;
     41}
     42
     43bool Sphere_impl::isOnSurface(const Vector &point) const{
     44  return fabs(point.NormSquared()-1.)<MYEPSILON;
     45}
     46
     47Vector Sphere_impl::getNormal(const Vector &point) const throw(NotOnSurfaceException){
    4848  if(!isOnSurface(point)){
    4949    throw NotOnSurfaceException() << ShapeVector(&point);
    … …  
    5252}
    5353
    54 LineSegmentSet Sphere_impl::getLineIntersections(const Line &line){
     54LineSegmentSet Sphere_impl::getLineIntersections(const Line &line) const{
    5555  LineSegmentSet res(line);
    5656  std::vector<Vector> intersections = line.getSphereIntersections();
    … …  
    134134}
    135135
    136 bool Cuboid_impl::isInside(const Vector &point){
     136bool Cuboid_impl::isInside(const Vector &point) const{
    137137  return (point[0]>=0 && point[0]<=1) && (point[1]>=0 && point[1]<=1) && (point[2]>=0 && point[2]<=1);
    138138}
    139139
    140 bool Cuboid_impl::isOnSurface(const Vector &point){
     140bool Cuboid_impl::isOnSurface(const Vector &point) const{
    141141  bool retVal = isInside(point);
    142142  // test all borders of the cuboid
    … …  
    149149}
    150150
    151 Vector Cuboid_impl::getNormal(const Vector &point) throw(NotOnSurfaceException){
     151Vector Cuboid_impl::getNormal(const Vector &point) const throw(NotOnSurfaceException){
    152152  if(!isOnSurface(point)){
    153153    throw NotOnSurfaceException() << ShapeVector(&point);
    … …  
    167167}
    168168
    169 LineSegmentSet Cuboid_impl::getLineIntersections(const Line &line){
     169LineSegmentSet Cuboid_impl::getLineIntersections(const Line &line) const{
    170170  LineSegmentSet res(line);
    171171  // get the intersection on each of the six faces

  • src/Shapes/BaseShapes_impl.hpp

    rb92e4a r735940  
    2323
    2424class Sphere_impl : public Shape_impl {
    25   virtual bool isInside(const Vector &point);
    26   virtual bool isOnSurface(const Vector &point);
    27   virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException);
    28   virtual LineSegmentSet getLineIntersections(const Line&);
     25  virtual bool isInside(const Vector &point) const;
     26  virtual bool isOnSurface(const Vector &point) const;
     27  virtual Vector getNormal(const Vector &point) const throw(NotOnSurfaceException);
     28  virtual LineSegmentSet getLineIntersections(const Line&) const;
    2929  virtual std::string toString() const;
    3030  virtual enum ShapeType getType() const;
    … …  
    3333
    3434class Cuboid_impl : public Shape_impl {
    35   virtual bool isInside(const Vector &point);
    36   virtual bool isOnSurface(const Vector &point);
    37   virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException);
    38   virtual LineSegmentSet getLineIntersections(const Line&);
     35  virtual bool isInside(const Vector &point) const;
     36  virtual bool isOnSurface(const Vector &point) const;
     37  virtual Vector getNormal(const Vector &point) const throw(NotOnSurfaceException);
     38  virtual LineSegmentSet getLineIntersections(const Line&) const;
    3939  virtual std::string toString() const;
    4040  virtual enum ShapeType getType() const;

  • src/Shapes/Shape.cpp

    rb92e4a r735940  
    4949}
    5050
    51 LineSegmentSet Shape::getLineIntersections(const Line &line){
     51LineSegmentSet Shape::getLineIntersections(const Line &line) const{
    5252  return impl->getLineIntersections(line);
    5353}
    … …  
    111111AndShape_impl::~AndShape_impl(){}
    112112
    113 bool AndShape_impl::isInside(const Vector &point){
     113bool AndShape_impl::isInside(const Vector &point) const{
    114114  return lhs->isInside(point) && rhs->isInside(point);
    115115}
    116116
    117 bool AndShape_impl::isOnSurface(const Vector &point){
     117bool AndShape_impl::isOnSurface(const Vector &point) const{
    118118  // check the number of surfaces that this point is on
    119119  int surfaces =0;
    … …  
    147147}
    148148
    149 Vector AndShape_impl::getNormal(const Vector &point) throw (NotOnSurfaceException){
     149Vector AndShape_impl::getNormal(const Vector &point) const throw (NotOnSurfaceException){
    150150  Vector res;
    151151  if(!isOnSurface(point)){
    … …  
    158158}
    159159
    160 LineSegmentSet AndShape_impl::getLineIntersections(const Line &line){
     160LineSegmentSet AndShape_impl::getLineIntersections(const Line &line) const{
    161161  return intersect(lhs->getLineIntersections(line),rhs->getLineIntersections(line));
    162162}
    … …  
    201201OrShape_impl::~OrShape_impl(){}
    202202
    203 bool OrShape_impl::isInside(const Vector &point){
     203bool OrShape_impl::isInside(const Vector &point) const{
    204204  return rhs->isInside(point) || lhs->isInside(point);
    205205}
    206206
    207 bool OrShape_impl::isOnSurface(const Vector &point){
     207bool OrShape_impl::isOnSurface(const Vector &point) const{
    208208  // check the number of surfaces that this point is on
    209209  int surfaces =0;
    … …  
    237237}
    238238
    239 Vector OrShape_impl::getNormal(const Vector &point) throw (NotOnSurfaceException){
     239Vector OrShape_impl::getNormal(const Vector &point) const throw (NotOnSurfaceException){
    240240  Vector res;
    241241  if(!isOnSurface(point)){
    … …  
    248248}
    249249
    250 LineSegmentSet OrShape_impl::getLineIntersections(const Line &line){
     250LineSegmentSet OrShape_impl::getLineIntersections(const Line &line) const{
    251251  return merge(lhs->getLineIntersections(line),rhs->getLineIntersections(line));
    252252}
    … …  
    290290NotShape_impl::~NotShape_impl(){}
    291291
    292 bool NotShape_impl::isInside(const Vector &point){
     292bool NotShape_impl::isInside(const Vector &point) const{
    293293  return !arg->isInside(point);
    294294}
    295295
    296 bool NotShape_impl::isOnSurface(const Vector &point){
     296bool NotShape_impl::isOnSurface(const Vector &point) const{
    297297  return arg->isOnSurface(point);
    298298}
    299299
    300 Vector NotShape_impl::getNormal(const Vector &point) throw(NotOnSurfaceException){
     300Vector NotShape_impl::getNormal(const Vector &point) const throw(NotOnSurfaceException){
    301301  return -1.*arg->getNormal(point);
    302302}
    303303
    304 LineSegmentSet NotShape_impl::getLineIntersections(const Line &line){
     304LineSegmentSet NotShape_impl::getLineIntersections(const Line &line) const{
    305305  return invert(arg->getLineIntersections(line));
    306306}

  • src/Shapes/Shape.hpp

    rb92e4a r735940  
    4545  Vector getRadius() const;
    4646
    47   LineSegmentSet getLineIntersections(const Line&);
     47  LineSegmentSet getLineIntersections(const Line&) const;
    4848  std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
    4949

  • src/Shapes/ShapeOps.cpp

    rb92e4a r735940  
    3434ShapeOpsBase_impl::~ShapeOpsBase_impl(){}
    3535
    36 bool ShapeOpsBase_impl::isInside(const Vector &point){
     36bool ShapeOpsBase_impl::isInside(const Vector &point) const{
    3737  return arg->isInside(translateIn(point));
    3838}
    3939
    40 bool ShapeOpsBase_impl::isOnSurface(const Vector &point){
     40bool ShapeOpsBase_impl::isOnSurface(const Vector &point) const{
    4141  return arg->isOnSurface(translateIn(point));
    4242}
    4343
    44 Vector ShapeOpsBase_impl::getNormal(const Vector &point) throw (NotOnSurfaceException){
     44Vector ShapeOpsBase_impl::getNormal(const Vector &point) const throw (NotOnSurfaceException){
    4545  Vector helper = translateIn(point);
    4646  if(!arg->isOnSurface(helper)){
    … …  
    5252}
    5353
    54 LineSegmentSet ShapeOpsBase_impl::getLineIntersections(const Line &line){
     54LineSegmentSet ShapeOpsBase_impl::getLineIntersections(const Line &line) const{
    5555  Line newLine(translateIn(line.getOrigin()),translateIn(line.getDirection()));
    5656  LineSegmentSet res(line);
    … …  
    9393Resize_impl::~Resize_impl(){}
    9494
    95 bool Resize_impl::isInside(const Vector& point){
     95bool Resize_impl::isInside(const Vector& point) const{
    9696  return getArg()->isInside((1/size) * point);
    9797}
    9898
    99 Vector Resize_impl::translateIn(const Vector& point){
     99Vector Resize_impl::translateIn(const Vector& point) const{
    100100  return (1/size) * point;
    101101}
    102102
    103 Vector Resize_impl::translateOutPos(const Vector& point){
     103Vector Resize_impl::translateOutPos(const Vector& point) const{
    104104  return size * point;
    105105}
    106106
    107 Vector Resize_impl::translateOutNormal(const Vector& point){
     107Vector Resize_impl::translateOutNormal(const Vector& point) const{
    108108  return point;
    109109}
    … …  
    137137Translate_impl::~Translate_impl(){}
    138138
    139 bool Translate_impl::isInside(const Vector& point){
     139bool Translate_impl::isInside(const Vector& point) const{
    140140  return getArg()->isInside(point-offset);
    141141}
    142142
    143 Vector Translate_impl::translateIn(const Vector& point){
     143Vector Translate_impl::translateIn(const Vector& point) const{
    144144  return point-offset;
    145145}
    146146
    147 Vector Translate_impl::translateOutPos(const Vector& point){
     147Vector Translate_impl::translateOutPos(const Vector& point) const{
    148148  return point+offset;
    149149}
    150150
    151 Vector Translate_impl::translateOutNormal(const Vector& point){
     151Vector Translate_impl::translateOutNormal(const Vector& point) const{
    152152  return point;
    153153}
    … …  
    187187Stretch_impl::~Stretch_impl(){}
    188188
    189 bool Stretch_impl::isInside(const Vector& point){
     189bool Stretch_impl::isInside(const Vector& point) const{
    190190  Vector helper=point;
    191191  helper.ScaleAll(reciFactors);
    … …  
    193193}
    194194
    195 Vector Stretch_impl::translateIn(const Vector& point){
     195Vector Stretch_impl::translateIn(const Vector& point) const{
    196196  Vector helper=point;
    197197  helper.ScaleAll(reciFactors);
    … …  
    199199}
    200200
    201 Vector Stretch_impl::translateOutPos(const Vector& point){
     201Vector Stretch_impl::translateOutPos(const Vector& point) const{
    202202  Vector helper=point;
    203203  helper.ScaleAll(factors);
    … …  
    205205}
    206206
    207 Vector Stretch_impl::translateOutNormal(const Vector& point){
     207Vector Stretch_impl::translateOutNormal(const Vector& point) const{
    208208  Vector helper=point;
    209209  // the normalFactors are derived from appearances of the factors
    … …  
    246246Transform_impl::~Transform_impl(){}
    247247
    248 bool Transform_impl::isInside(const Vector& point){
     248bool Transform_impl::isInside(const Vector& point) const{
    249249  return getArg()->isInside(transformationInv * point);
    250250}
    251251
    252 Vector Transform_impl::translateIn(const Vector& point){
     252Vector Transform_impl::translateIn(const Vector& point) const{
    253253  return transformationInv * point;
    254254}
    255255
    256 Vector Transform_impl::translateOutPos(const Vector& point){
     256Vector Transform_impl::translateOutPos(const Vector& point) const{
    257257  return transformation * point;
    258258}
    259259
    260 Vector Transform_impl::translateOutNormal(const Vector& point){
     260Vector Transform_impl::translateOutNormal(const Vector& point) const
     261{
    261262  RealSpaceMatrix mat = transformation.invert().transpose();
    262263  return mat * point;

  • src/Shapes/ShapeOps_impl.hpp

    rb92e4a r735940  
    2929  ShapeOpsBase_impl(const Shape::impl_ptr&);
    3030  virtual ~ShapeOpsBase_impl();
    31   virtual bool isInside(const Vector &point);
    32   virtual bool isOnSurface(const Vector &point);
    33   virtual Vector getNormal(const Vector &point) throw (NotOnSurfaceException);
    34   virtual LineSegmentSet getLineIntersections(const Line&);
     31  virtual bool isInside(const Vector &point) const;
     32  virtual bool isOnSurface(const Vector &point) const;
     33  virtual Vector getNormal(const Vector &point) const throw (NotOnSurfaceException);
     34  virtual LineSegmentSet getLineIntersections(const Line&) const;
    3535  virtual enum ShapeType getType() const;
    3636  virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
    3737protected:
    38   virtual Vector translateIn(const Vector &point)=0;
    39   virtual Vector translateOutPos(const Vector &point)=0;
    40   virtual Vector translateOutNormal(const Vector &point)=0;
     38  virtual Vector translateIn(const Vector &point) const=0;
     39  virtual Vector translateOutPos(const Vector &point) const=0;
     40  virtual Vector translateOutNormal(const Vector &point) const=0;
    4141  Shape::impl_ptr getArg() const;
    4242private:
    … …  
    5050  virtual ~Resize_impl();
    5151protected:
    52   virtual Vector translateIn(const Vector &point);
    53   virtual Vector translateOutPos(const Vector &point);
    54   virtual Vector translateOutNormal(const Vector &point);
     52  virtual Vector translateIn(const Vector &point) const;
     53  virtual Vector translateOutPos(const Vector &point) const;
     54  virtual Vector translateOutNormal(const Vector &point) const;
    5555  virtual std::string toString() const;
    56   virtual bool isInside(const Vector& point);
     56  virtual bool isInside(const Vector& point) const;
    5757  virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
    5858private:
    … …  
    6666  virtual ~Translate_impl();
    6767protected:
    68   virtual Vector translateIn(const Vector &point);
    69   virtual Vector translateOutPos(const Vector &point);
    70   virtual Vector translateOutNormal(const Vector &point);
     68  virtual Vector translateIn(const Vector &point) const;
     69  virtual Vector translateOutPos(const Vector &point) const;
     70  virtual Vector translateOutNormal(const Vector &point) const;
    7171  virtual std::string toString() const;
    72   virtual bool isInside(const Vector& point);
     72  virtual bool isInside(const Vector& point) const;
    7373  virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
    7474private:
    … …  
    8282  virtual ~Stretch_impl();
    8383protected:
    84   virtual Vector translateIn(const Vector &point);
    85   virtual Vector translateOutPos(const Vector &point);
    86   virtual Vector translateOutNormal(const Vector &point);
     84  virtual Vector translateIn(const Vector &point) const;
     85  virtual Vector translateOutPos(const Vector &point) const;
     86  virtual Vector translateOutNormal(const Vector &point) const;
    8787  virtual std::string toString() const;
    88   virtual bool isInside(const Vector& point);
     88  virtual bool isInside(const Vector& point) const;
    8989  virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
    9090private:
    … …  
    9999  virtual ~Transform_impl();
    100100protected:
    101   virtual Vector translateIn(const Vector &point);
    102   virtual Vector translateOutPos(const Vector &point);
    103   virtual Vector translateOutNormal(const Vector &point);
     101  virtual Vector translateIn(const Vector &point) const;
     102  virtual Vector translateOutPos(const Vector &point) const;
     103  virtual Vector translateOutNormal(const Vector &point) const;
    104104  virtual std::string toString() const;
    105   virtual bool isInside(const Vector& point);
     105  virtual bool isInside(const Vector& point) const;
    106106  virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
    107107private:

  • 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.