Changeset f70c2a for molecuilder

Timestamp:

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

Author:

Tillmann Crueger <crueger@…>

Children:

4eee8f

Parents:

cb2b9a

Message:

Added const correctness to plane class and simplified interface

Location:

molecuilder/src

Files:

• Plane.cpp (modified) (2 diffs)
• Plane.hpp (modified) (1 diff)
• Space.cpp (modified) (2 diffs)
• Space.hpp (modified) (1 diff)
• vector.cpp (modified) (1 diff)
• vector.hpp (modified) (1 diff)

molecuilder/src/Plane.cpp

@@ -172 +172 @@
 /************ Methods inherited from Space ****************/
 
-double Plane::distance(Vector &point){
+double Plane::distance(const Vector &point) const{
   double res = point.ScalarProduct(*normalVector)-offset;
   return fabs(res);
 }
 
-Vector Plane::getClosestPoint(Vector &point){
+Vector Plane::getClosestPoint(const Vector &point) const{
   Vector difference = distance(point) * (*normalVector);
   if(difference.IsZero()){
@@ -189 +189 @@
   return (point - (sign * difference));
 }
-
-bool Plane::isContained(Vector &point){
-  return (fabs(point.ScalarProduct(*normalVector) - offset)) < MYEPSILON;
-}

molecuilder/src/Plane.hpp

@@ -52 +52 @@
   /****** Methods inherited from Space ***********/
 
-  virtual double distance(Vector &point);
-  virtual Vector getClosestPoint(Vector &point);
-  virtual bool isContained(Vector &point);
-
+  virtual double distance(const Vector &point) const;
+  virtual Vector getClosestPoint(const Vector &point) const;
 
 private:

molecuilder/src/Space.cpp

@@ -7 +7 @@
 
 #include "Space.hpp"
+#include "vector.hpp"
 
 Space::Space()
@@ -13 +14 @@
 Space::~Space()
 {}
+
+bool Space::hasZero() const{
+  return isContained(zeroVec);
+}
+
+bool Space::isContained(const Vector &point) const{
+  return (distance(point)) < MYEPSILON;
+}

molecuilder/src/Space.hpp

@@ -17 +17 @@
   virtual ~Space();
 
-  virtual double distance(Vector &point)=0;
-  virtual Vector getClosestPoint(Vector &point)=0;
-  virtual bool isContained(Vector &point)=0;
+  virtual double distance(const Vector &point) const=0;
+  virtual Vector getClosestPoint(const Vector &point) const=0;
+  virtual bool isContained(const Vector &point) const;
+  virtual bool hasZero() const;
+
 };
 

molecuilder/src/vector.cpp

@@ -719 +719 @@
   return isInside;
 }
+
+
+// some comonly used vectors
+const Vector zeroVec(0,0,0);
+const Vector e1(1,0,0);
+const Vector e2(0,1,0);
+const Vector e3(0,0,1);

molecuilder/src/vector.hpp

@@ -101 +101 @@
 };
 
+// some commonly used and fixed vectors
+const extern Vector zeroVec;
+const extern Vector e1;
+const extern Vector e2;
+const extern Vector e3;
+
 ostream & operator << (ostream& ost, const Vector &m);
 const Vector& operator*=(Vector& a, const double m);