Changes in src/Shapes/Shape_impl.hpp [cfda65:e09b70]

File:

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

src/Shapes/Shape_impl.hpp

@@ -10 +10 @@
 
 #include "Shapes/Shape.hpp"
-#include "vector.hpp"
 
 class Shape_impl {
@@ -17 +16 @@
   virtual ~Shape_impl(){};
   virtual bool isInside(const Vector &point)=0;
-  virtual bool isOnSurface(const Vector &point)=0;
-  virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException)=0;
-  virtual std::string toString()=0;
 };
 
@@ -27 +23 @@
     return true;
   }
-  virtual bool isOnSurface(const Vector &point){
-    return false;
-  }
-  virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException){
-    throw NotOnSurfaceException(__FILE__,__LINE__);
-  }
-  virtual std::string toString(){
-    return "Everywhere()";
-  }
 };
 
@@ -41 +28 @@
   virtual bool isInside(const Vector &point){
     return false;
-  }
-  virtual bool isOnSurface(const Vector &point){
-    return false;
-  }
-  virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException){
-    throw NotOnSurfaceException(__FILE__,__LINE__);
-  }
-  virtual std::string toString(){
-    return "Nowhere()";
   }
 };
@@ -58 +36 @@
   virtual ~AndShape_impl();
   virtual bool isInside(const Vector &point);
-  virtual bool isOnSurface(const Vector &point);
-  virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException);
-  virtual std::string toString();
 private:
   Shape::impl_ptr lhs;
@@ -71 +46 @@
   virtual ~OrShape_impl();
   virtual bool isInside(const Vector &point);
-  virtual bool isOnSurface(const Vector &point);
-  virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException);
-  virtual std::string toString();
 private:
   Shape::impl_ptr lhs;
@@ -84 +56 @@
   virtual ~NotShape_impl();
   virtual bool isInside(const Vector &point);
-  virtual bool isOnSurface(const Vector &point);
-  virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException);
-  virtual std::string toString();
 private:
   Shape::impl_ptr arg;