Changeset daf5d6 for molecuilder/src/vector.hpp

Timestamp:

Aug 19, 2009, 12:30:21 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

78dac6

Parents:

27459a (diff), 6c09a4 (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 branch 'VectorUnitTest' into ConcaveHull

File:

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

molecuilder/src/vector.hpp

@@ -5 +5 @@
 
 #include "helpers.hpp"
+
+#include <gsl/gsl_vector.h>
+#include <gsl/gsl_multimin.h>
 
 class Vector;
@@ -24 +27 @@
   double PeriodicDistanceSquared(const Vector *y, const double *cell_size) const;
   double ScalarProduct(const Vector *y) const;
-  double Projection(const Vector *y) const;
   double Norm() const;
   double NormSquared() const;
   double Angle(const Vector *y) const;
-  bool IsNull() const;
+  bool IsZero() const;
+  bool IsOne() const;
+  bool IsNormalTo(const Vector *normal) const;
 
   void AddVector(const Vector *y);
   void SubtractVector(const Vector *y);
   void CopyVector(const Vector *y);
+  void CopyVector(const Vector y);
   void RotateVector(const Vector *y, const double alpha);
   void VectorProduct(const Vector *y);
   void ProjectOntoPlane(const Vector *y);
+  void ProjectIt(const Vector *y);
+  Vector Projection(const Vector *y) const;
   void Zero();
   void One(double one);
@@ -64 +71 @@
 
 ostream & operator << (ostream& ost, const Vector &m);
-//Vector& operator+=(Vector& a, const Vector& b);
-//Vector& operator*=(Vector& a, const double m);
-//Vector& operator*(const Vector& a, const double m);
-//Vector& operator+(const Vector& a, const Vector& b);
+bool operator==(const Vector& a, const Vector& b);
+Vector& operator+=(Vector& a, const Vector& b);
+Vector& operator-=(Vector& a, const Vector& b);
+Vector& operator*=(Vector& a, const double m);
+Vector& operator*(const Vector& a, const double m);
+Vector& operator*(const double m, const Vector& a);
+Vector& operator+(const Vector& a, const Vector& b);
+Vector& operator-(const Vector& a, const Vector& b);
+
+// some algebraic matrix stuff
+#define RDET3(a) ((a)[0]*(a)[4]*(a)[8] + (a)[3]*(a)[7]*(a)[2] + (a)[6]*(a)[1]*(a)[5] - (a)[2]*(a)[4]*(a)[6] - (a)[5]*(a)[7]*(a)[0] - (a)[8]*(a)[1]*(a)[3])  //!< hard-coded determinant of a 3x3 matrix
+#define RDET2(a0,a1,a2,a3) ((a0)*(a3)-(a1)*(a2))                      //!< hard-coded determinant of a 2x2 matrix
+
+
 
 #endif /*VECTOR_HPP_*/