Changeset 59e7832 for molecuilder/src/Plane.cpp

Timestamp:

Apr 30, 2010, 1:33:12 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

25e17e9

Parents:

4eee8f

Message:

Added unittests for planes

File:

• molecuilder/src/Plane.cpp (modified) (5 diffs)

molecuilder/src/Plane.cpp

@@ -44 +44 @@
  * If no offset is given a plane through origin is assumed
  */
-Plane::Plane(const Vector &y1, const Vector &y2, double _offset) throw(LinearDependenceException) :
+Plane::Plane(const Vector &y1, const Vector &y2, double _offset) throw(ZeroVectorException,LinearDependenceException) :
     normalVector(new Vector()),
     offset(_offset)
@@ -50 +50 @@
   Vector x1 = y1;
   Vector x2 = y2;
-  if ((fabs(x1.Norm()) < MYEPSILON) || (fabs(x2.Norm()) < MYEPSILON) || (fabs(x1.Angle(x2)) < MYEPSILON)) {
+  if ((fabs(x1.Norm()) < MYEPSILON) || (fabs(x2.Norm()) < MYEPSILON)) {
+    throw ZeroVectorException(__FILE__,__LINE__);
+  }
+
+  if((fabs(x1.Angle(x2)) < MYEPSILON)) {
     throw LinearDependenceException(__FILE__,__LINE__);
   }
@@ -92 +96 @@
 
 
-Vector Plane::getNormal(){
+Vector Plane::getNormal() const{
   return *normalVector;
 }
 
-double Plane::getOffset(){
+double Plane::getOffset() const{
   return offset;
 }
@@ -106 +110 @@
 vector<Vector> Plane::getPointsOnPlane(){
   std::vector<Vector> res;
+  res.reserve(3);
   // first point on the plane
-  res[0] = getOffsetVector();
-  // first is orthogonal to the plane...
-  // an orthogonal vector to this one lies on the plane
+  res.push_back(getOffsetVector());
+  // get a vector that has direction of plane
   Vector direction;
-  direction.GetOneNormalVector(res[0]);
-  res[1] = res[0]+direction;
-  // get an orthogonal vector to direction and offset (lies on the plane)
-  direction.VectorProduct(res[0]);
+  direction.GetOneNormalVector(getNormal());
+  res.push_back(res[0]+direction);
+  // get an orthogonal vector to direction and normal (has direction of plane)
+  direction.VectorProduct(getNormal());
   direction.Normalize();
-  res[2] = res[0] +direction;
+  res.push_back(res[0] +direction);
   return res;
 }
@@ -178 +182 @@
 
 Vector Plane::getClosestPoint(const Vector &point) const{
-  Vector difference = distance(point) * (*normalVector);
-  if(difference.IsZero()){
+  double factor = point.ScalarProduct(*normalVector)-offset;
+  if(fabs(factor) < MYEPSILON){
     // the point itself lies on the plane
     return point;
   }
-  // get the direction this vector is pointing
-  double sign = difference.ScalarProduct(*normalVector);
-  // sign cannot be zero, since normalVector and difference are both != zero
-  sign = sign/fabs(sign);
-  return (point - (sign * difference));
+  Vector difference = factor * (*normalVector);
+  return (point - difference);
 }
+
+// Operators
+
+ostream &operator << (ostream &ost,const Plane &p){
+  ost << "<" << p.getNormal() << ";x> - " << p.getOffset() << "=0";
+  return ost;
+}