Changeset 8c01ce for molecuilder/src/vector.hpp

Timestamp:

May 8, 2010, 10:05:35 AM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

abde75

Parents:

1775d3 (diff), 25e17e9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit 'jupiter/StructureRefactoring' into StructureRefactoring

File:

• molecuilder/src/vector.hpp (modified) (5 diffs)

molecuilder/src/vector.hpp

@@ -18 +18 @@
 
 #include "defs.hpp"
+#include "Space.hpp"
 
 /********************************************** declarations *******************************/
@@ -24 +25 @@
  * basically, just a x[3] but with helpful functions
  */
-class Vector {
+class Vector : public Space{
 protected:
   // this struct is used to indicate calls to the Baseconstructor from inside vectors.
@@ -79 +80 @@
 
   // Methods that are derived directly from other methods
-  double Distance(const Vector &y) const;
   double Norm() const;
   double NormSquared() const;
@@ -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);
   Vector const operator+(const Vector& b) const;
   Vector const operator-(const Vector& b) const;
+
+  // Methods inherited from Space
+  virtual double distance(const Vector &point) const;
+  virtual Vector getClosestPoint(const Vector &point) const;
 
 protected:
@@ -101 +106 @@
 };
 
+// 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);