Changeset 0e9394 for molecuilder

Timestamp:

Apr 30, 2010, 9:03:57 AM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

7a8319

Parents:

c53e0b

git-author:

Tillmann Crueger <crueger@…> (04/30/10 08:26:28)

git-committer:

Tillmann Crueger <crueger@…> (04/30/10 09:03:57)

Message:

Added a class Space to represent general subspaces of R^{3 (planes and lines)}

Location:

molecuilder/src

Files:

• Makefile.am (modified) (2 diffs)
• Plane.cpp (modified) (3 diffs)
• Plane.hpp (modified) (2 diffs)
• Space.cpp (added)
• Space.hpp (added)

molecuilder/src/Makefile.am

@@ -123 +123 @@
                  periodentafel.cpp \
                  Plane.cpp \
+                 Space.cpp \
                  tesselation.cpp \
                  tesselationhelpers.cpp \
@@ -161 +162 @@
           periodentafel.hpp \
           Plane.hpp \
+          Space.hpp \
           stackclass.hpp \
           tesselation.hpp \

molecuilder/src/Plane.cpp

@@ -8 +8 @@
 #include "Plane.hpp"
 #include "vector.hpp"
+#include "defs.hpp"
 #include "Exceptions/LinearDependenceException.hpp"
 #include "info.hpp"
@@ -13 +14 @@
 #include "verbose.hpp"
 #include "Helpers/Assert.hpp"
+#include <cmath>
 
 /**
@@ -163 +165 @@
   return res;
 };
+
+/************ Methods inherited from Space ****************/
+
+double Plane::distance(Vector &point){
+  double res = point.ScalarProduct(*normalVector)-offset;
+  return fabs(res);
+}
+
+Vector Plane::getClosestPoint(Vector &point){
+  Vector difference = distance(point) * (*normalVector);
+  if(difference.IsZero()){
+    // 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));
+}
+
+bool Plane::isContained(Vector &point){
+  return (point.ScalarProduct(*normalVector) - offset) < MYEPSILON;
+}

molecuilder/src/Plane.hpp

@@ -11 +11 @@
 #include <memory>
 #include <vector>
+#include "Space.hpp"
 
 class Vector;
 
-class Plane
+class Plane : public Space
 {
   typedef std::auto_ptr<Vector> vec_ptr;
@@ -47 +48 @@
   Vector GetIntersection(const Vector &Origin, const Vector &LineVector);
 
+  /****** Methods inherited from Space ***********/
+
+  virtual double distance(Vector &point);
+  virtual Vector getClosestPoint(Vector &point);
+  virtual bool isContained(Vector &point);
+
+
 private:
   vec_ptr normalVector;