Changeset 59e7832 for molecuilder

Timestamp:

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

Author:

Tillmann Crueger <crueger@…>

Children:

25e17e9

Parents:

4eee8f

Message:

Added unittests for planes

Location:

molecuilder/src

Files:

• Plane.cpp (modified) (5 diffs)
• Plane.hpp (modified) (4 diffs)
• unittests/Makefile.am (modified) (4 diffs)
• unittests/PlaneUnittest.cpp (added)
• unittests/PlaneUnittest.hpp (added)
• vector.cpp (modified) (1 diff)
• vector.hpp (modified) (1 diff)
• vector_ops.cpp (modified) (1 diff)

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;
+}

molecuilder/src/Plane.hpp

@@ -11 +11 @@
 #include <memory>
 #include <vector>
+#include <iostream>
 #include "Space.hpp"
 #include "Exceptions/LinearDependenceException.hpp"
@@ -22 +23 @@
 public:
   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 &y1, const Vector &y2, double _offset) throw(ZeroVectorException,LinearDependenceException);
+  Plane(const Vector &_normalVector, double _offset)  throw(ZeroVectorException);
   Plane(const Vector &_normalVector, const Vector &_offsetVector) throw(ZeroVectorException);
   virtual ~Plane();
@@ -31 +32 @@
    * returns normal Vector for a plane
    */
-  Vector getNormal();
+  Vector getNormal() const;
   /**
    * returns the distance of the plane from the origin
    */
-  double getOffset();
+  double getOffset() const;
   /**
    * returns a vector that points on the plane.
@@ -60 +61 @@
 };
 
+std::ostream &operator<< (std::ostream &ost,const Plane& p);
+
 #endif /* PLANE_HPP_ */

molecuilder/src/unittests/Makefile.am

@@ -30 +30 @@
   MemoryAllocatorUnitTest \
   MoleculeDescriptorTest \
+  PlaneUnittest \
   ObserverTest \
   SingletonTest \
@@ -70 +71 @@
   memoryusageobserverunittest.cpp \
   MoleculeDescriptorTest.cpp \
+  PlaneUnittest.cpp \
   ObserverTest.cpp \
   SingletonTest.cpp \
@@ -102 +104 @@
   memoryusageobserverunittest.hpp \
   MoleculeDescriptorTest.hpp \
+  PlaneUnittest.hpp \
   ObserverTest.hpp \
   SingletonTest.hpp \
@@ -168 +171 @@
 MoleculeDescriptorTest_LDADD = ${ALLLIBS}
 
+PlaneUnittest_SOURCES = UnitTestMain.cpp PlaneUnittest.cpp PlaneUnittest.hpp
+PlaneUnittest_LDADD = ${ALLLIBS}
+
 SingletonTest_SOURCES = UnitTestMain.cpp SingletonTest.cpp SingletonTest.hpp
 SingletonTest_LDADD = $(BOOST_LIB) ${BOOST_THREAD_LIB}

molecuilder/src/vector.cpp

@@ -421 +421 @@
 };
 
+bool Vector::operator!=(const Vector& b) const
+{
+  return !IsEqualTo(b);
+}
+
 /** Sums vector \a to this lhs component-wise.
  * \param a base vector

molecuilder/src/vector.hpp

@@ -89 +89 @@
   // operators for mathematical operations
   bool operator==(const Vector& b) const;
+  bool operator!=(const Vector& b) const;
   const Vector& operator+=(const Vector& b);
   const Vector& operator-=(const Vector& b);

molecuilder/src/vector_ops.cpp

@@ -126 +126 @@
     y = Plane(axis,a,0).getNormal();
   }
-  catch (LinearDependenceException &excp) {
+  catch (MathException &excp) {
     // The normal vector cannot be created if there is linar dependency.
     // Then the vector to rotate is on the axis and any rotation leads to the vector itself.