Changeset 0f55b2 for molecuilder/src/vector.hpp

Timestamp:

Apr 9, 2010, 2:45:49 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

1f591b

Parents:

71910a

Message:

Started work on the VectorComposites

File:

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

molecuilder/src/vector.hpp

@@ -23 +23 @@
  */
 class Vector {
+protected:
+  // this struct is used to indicate calls to the Baseconstructor from inside vectors.
+  struct Baseconstructor{};
   public:
 
@@ -28 +31 @@
   Vector(const double x1, const double x2, const double x3);
   Vector(const Vector& src);
-  ~Vector();
+  virtual ~Vector();
 
-  double Distance(const Vector * const y) const;
-  double DistanceSquared(const Vector * const y) const;
-  double DistanceToPlane(const Vector * const PlaneNormal, const Vector * const PlaneOffset) const;
-  double PeriodicDistance(const Vector * const y, const double * const cell_size) const;
-  double PeriodicDistanceSquared(const Vector * const y, const double * const cell_size) const;
-  double ScalarProduct(const Vector * const y) const;
-  double Norm() const;
-  double NormSquared() const;
-  double Angle(const Vector * const y) const;
-  bool IsZero() const;
-  bool IsOne() const;
-  bool IsNormalTo(const Vector * const normal) const;
-  bool IsEqualTo(const Vector * const a) const;
+  virtual double Distance(const Vector * const y) const;
+  virtual double DistanceSquared(const Vector * const y) const;
+  virtual double DistanceToPlane(const Vector * const PlaneNormal, const Vector * const PlaneOffset) const;
+  virtual double PeriodicDistance(const Vector * const y, const double * const cell_size) const;
+  virtual double PeriodicDistanceSquared(const Vector * const y, const double * const cell_size) const;
+  virtual double ScalarProduct(const Vector * const y) const;
+  virtual double Norm() const;
+  virtual double NormSquared() const;
+  virtual double Angle(const Vector * const y) const;
+  virtual bool IsZero() const;
+  virtual bool IsOne() const;
+  virtual bool IsNormalTo(const Vector * const normal) const;
+  virtual bool IsEqualTo(const Vector * const a) const;
 
-  void AddVector(const Vector * const y);
-  void SubtractVector(const Vector * const y);
-  void CopyVector(const Vector * const y);
-  void CopyVector(const Vector &y);
-  void VectorProduct(const Vector * const y);
-  void ProjectOntoPlane(const Vector * const y);
-  void ProjectIt(const Vector * const y);
-  Vector Projection(const Vector * const y) const;
-  void Zero();
-  void One(const double one);
-  void Init(const double x1, const double x2, const double x3);
-  void Normalize();
-  void Translate(const Vector * const x);
-  void Mirror(const Vector * const x);
-  void Scale(const double ** const factor);
-  void Scale(const double * const factor);
-  void Scale(const double factor);
-  void MatrixMultiplication(const double * const M);
-  bool InverseMatrixMultiplication(const double * const M);
-  void KeepPeriodic(const double * const matrix);
-  void LinearCombinationOfVectors(const Vector * const x1, const Vector * const x2, const Vector * const x3, const double * const factors);
-  double CutsPlaneAt(const Vector * const A, const Vector * const B, const Vector * const C) const;
-  bool GetOneNormalVector(const Vector * const x1);
-  bool MakeNormalTo(const Vector &y1);
+  virtual void AddVector(const Vector * const y);
+  virtual void SubtractVector(const Vector * const y);
+  virtual void CopyVector(const Vector * const y);
+  virtual void CopyVector(const Vector &y);
+  virtual void VectorProduct(const Vector * const y);
+  virtual void ProjectOntoPlane(const Vector * const y);
+  virtual void ProjectIt(const Vector * const y);
+  virtual Vector Projection(const Vector * const y) const;
+  virtual void Zero();
+  virtual void One(const double one);
+  virtual void Init(const double x1, const double x2, const double x3);
+  virtual void Normalize();
+  virtual void Translate(const Vector * const x);
+  virtual void Mirror(const Vector * const x);
+  virtual void Scale(const double ** const factor);
+  virtual void Scale(const double * const factor);
+  virtual void Scale(const double factor);
+  virtual void MatrixMultiplication(const double * const M);
+  virtual bool InverseMatrixMultiplication(const double * const M);
+  virtual void KeepPeriodic(const double * const matrix);
+  virtual void LinearCombinationOfVectors(const Vector * const x1, const Vector * const x2, const Vector * const x3, const double * const factors);
+  virtual double CutsPlaneAt(const Vector * const A, const Vector * const B, const Vector * const C) const;
+  virtual bool GetOneNormalVector(const Vector * const x1);
+  virtual bool MakeNormalTo(const Vector &y1);
   //bool SolveSystem(Vector * x1, Vector * x2, Vector * y, const double alpha, const double beta, const double c);
-  bool IsInParallelepiped(const Vector &offset, const double * const parallelepiped) const;
-  void WrapPeriodically(const double * const M, const double * const Minv);
+  virtual bool IsInParallelepiped(const Vector &offset, const double * const parallelepiped) const;
+  virtual void WrapPeriodically(const double * const M, const double * const Minv);
 
   // Accessors ussually come in pairs... and sometimes even more than that
-  double& operator[](size_t i);
-  const double& operator[](size_t i) const;
-  double& at(size_t i);
-  const double& at(size_t i) const;
+  virtual double& operator[](size_t i);
+  virtual const double& operator[](size_t i) const;
+  virtual double& at(size_t i);
+  virtual const double& at(size_t i) const;
 
   // Assignment operator
-  Vector &operator=(const Vector& src);
+  virtual Vector &operator=(const Vector& src);
 
   // Access to internal structure
-  double* get();
+  virtual double* get();
+
+  // operators for mathematical operations
+  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;
 
 private:
@@ -90 +100 @@
 
 ostream & operator << (ostream& ost, const Vector &m);
-bool operator==(const Vector& a, const Vector& b);
-const Vector& operator+=(Vector& a, const Vector& b);
-const Vector& operator-=(Vector& a, const Vector& b);
 const Vector& operator*=(Vector& a, const double m);
 Vector const operator*(const Vector& a, const double m);
 Vector const operator*(const double m, const Vector& a);
-Vector const operator+(const Vector& a, const Vector& b);
-Vector const operator-(const Vector& a, const Vector& b);
-
 
 #endif /*VECTOR_HPP_*/