Changeset e7ea64 for molecuilder/src/vector.hpp

Timestamp:

Apr 15, 2010, 10:54:26 AM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

32842d8

Parents:

1f591b

Message:

Changed implementation of Vector to forward operations to contained objects

File:

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

molecuilder/src/vector.hpp

@@ -15 +15 @@
 #include <gsl/gsl_multimin.h>
 
+#include <memory>
+
 #include "defs.hpp"
 
@@ -26 +28 @@
   // this struct is used to indicate calls to the Baseconstructor from inside vectors.
   struct Baseconstructor{};
-  public:
+public:
 
   Vector();
@@ -33 +35 @@
   virtual ~Vector();
 
-  virtual double Distance(const Vector &y) const;
+  // Method implemented by forwarding to the Representation
+
   virtual double DistanceSquared(const Vector &y) const;
   virtual double DistanceToPlane(const Vector &PlaneNormal, const Vector &PlaneOffset) const;
@@ -39 +42 @@
   virtual double PeriodicDistanceSquared(const Vector &y, const double * const cell_size) const;
   virtual double ScalarProduct(const Vector &y) const;
-  virtual double Norm() const;
-  virtual double NormSquared() const;
   virtual double Angle(const Vector &y) const;
   virtual bool IsZero() const;
@@ -49 +50 @@
   virtual void AddVector(const Vector &y);
   virtual void SubtractVector(const Vector &y);
-  virtual void CopyVector(const Vector &y);
   virtual void VectorProduct(const Vector &y);
   virtual void ProjectOntoPlane(const Vector &y);
   virtual void ProjectIt(const Vector &y);
   virtual Vector Projection(const Vector &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 &x);
   virtual void Mirror(const Vector &x);
-  virtual void Scale(const double ** const factor);
-  virtual void Scale(const double * const factor);
+  virtual void ScaleAll(const double *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 &x1, const Vector &x2, const Vector &x3, const double * const factors);
   virtual bool GetOneNormalVector(const Vector &x1);
   virtual bool MakeNormalTo(const Vector &y1);
-  //bool SolveSystem(Vector * x1, Vector * x2, Vector * y, const double alpha, const double beta, const double c);
   virtual bool IsInParallelepiped(const Vector &offset, const double * const parallelepiped) const;
   virtual void WrapPeriodically(const double * const M, const double * const Minv);
@@ -76 +68 @@
   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;
+  double& at(size_t i);
+  const double& at(size_t i) const;
 
   // Assignment operator
@@ -84 +76 @@
   // Access to internal structure
   virtual double* get();
+
+  // Methods that are derived directly from other methods
+  double Distance(const Vector &y) const;
+  double Norm() const;
+  double NormSquared() const;
+  void Normalize();
+  void Zero();
+  void One(const double one);
+  void LinearCombinationOfVectors(const Vector &x1, const Vector &x2, const Vector &x3, const double * const factors);
 
   // operators for mathematical operations
@@ -92 +93 @@
   Vector const operator-(const Vector& b) const;
 
+protected:
+  typedef std::auto_ptr<Vector> rep_ptr;
+  Vector(Baseconstructor);
+  Vector(Baseconstructor,const Vector*);
+  static Vector VecFromRep(const Vector*);
+
 private:
-  double x[NDIM];
+  // method used for protection, i.e. to avoid infinite recursion
+  // when our internal rep becomes messed up
+  virtual bool isBaseClass() const;
+  virtual Vector* clone() const;
+  // this is used to represent the vector internally
+  rep_ptr rep;
 
 };