Changeset aab470 for molecuilder/src

Timestamp:

Apr 30, 2010, 9:32:59 AM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

cb2b9a

Parents:

7a8319

Message:

Added exception specifiers to plane class

Location:

molecuilder/src

Files:

• Plane.cpp (modified) (5 diffs)
• Plane.hpp (modified) (2 diffs)

molecuilder/src/Plane.cpp

@@ -9 +9 @@
 #include "vector.hpp"
 #include "defs.hpp"
-#include "Exceptions/LinearDependenceException.hpp"
 #include "info.hpp"
 #include "log.hpp"
@@ -19 +18 @@
  * generates a plane from three given vectors defining three points in space
  */
-Plane::Plane(const Vector &y1, const Vector &y2, const Vector &y3) :
+Plane::Plane(const Vector &y1, const Vector &y2, const Vector &y3) throw(LinearDependenceException) :
   normalVector(new Vector())
 {
@@ -42 +41 @@
 }
 /**
- * Constructs a plane from two vectors and a offset.
+ * Constructs a plane from two direction vectors and a offset.
  * If no offset is given a plane through origin is assumed
  */
-Plane::Plane(const Vector &y1, const Vector &y2, double _offset):
+Plane::Plane(const Vector &y1, const Vector &y2, double _offset) throw(LinearDependenceException) :
     normalVector(new Vector()),
     offset(_offset)
@@ -67 +66 @@
 }
 
-Plane::Plane(const Vector &_normalVector, double _offset) :
+Plane::Plane(const Vector &_normalVector, double _offset) throw(ZeroVectorException):
   normalVector(new Vector(_normalVector)),
   offset(_offset)
 {
-  ASSERT(normalVector->Norm()>MYEPSILON,"Normalvector was zero when constructing a plane.");
+  if(normalVector->IsZero())
+    throw ZeroVectorException(__FILE__,__LINE__);
   double factor = 1/normalVector->Norm();
   // normalize the plane parameters
@@ -78 +78 @@
 }
 
-Plane::Plane(const Vector &_normalVector, const Vector &_offsetVector) :
+Plane::Plane(const Vector &_normalVector, const Vector &_offsetVector) throw(ZeroVectorException):
     normalVector(new Vector(_normalVector))
 {
+  if(normalVector->IsZero()){
+    throw ZeroVectorException(__FILE__,__LINE__);
+  }
   normalVector->Normalize();
   offset = normalVector->ScalarProduct(_offsetVector);

molecuilder/src/Plane.hpp

@@ -12 +12 @@
 #include <vector>
 #include "Space.hpp"
+#include "Exceptions/LinearDependenceException.hpp"
+#include "Exceptions/ZeroVectorException.hpp"
 
 class Vector;
@@ -19 +21 @@
   typedef std::auto_ptr<Vector> vec_ptr;
 public:
-  Plane(const Vector &y1, const Vector &y2, const Vector &y3);
-  Plane(const Vector &y1, const Vector &y2, double _offset);
-  Plane(const Vector &_normalVector, double _offset=0);
-  Plane(const Vector &_normalVector, const Vector &_offsetVector);
+  Plane(const Vector &y1, const Vector &y2, const Vector &y3) throw(LinearDependenceException);
+  Plane(const Vector &y1, const Vector &y2, double _offset) throw(LinearDependenceException);
+  Plane(const Vector &_normalVector, double _offset=0)  throw(ZeroVectorException);
+  Plane(const Vector &_normalVector, const Vector &_offsetVector) throw(ZeroVectorException);
   virtual ~Plane();