Changes in src/vector.hpp [0c7ed8:8e17d6]

File:

• src/vector.hpp (modified) (7 diffs)

src/vector.hpp

@@ -11 +11 @@
 #endif
 
-#include <iostream>
-#include <gsl/gsl_vector.h>
-#include <gsl/gsl_multimin.h>
+#include <iosfwd>
 
 #include <memory>
@@ -24 +22 @@
 
 class Vector;
+class Matrix;
+struct VectorContent;
 
 typedef std::vector<Vector> pointset;
@@ -31 +31 @@
  */
 class Vector : public Space{
+  friend Vector operator*(const Matrix&,const Vector&);
+  friend class Matrix;
 public:
-
   Vector();
   Vector(const double x1, const double x2, const double x3);
@@ -42 +43 @@
   double DistanceSquared(const Vector &y) const;
   double DistanceToSpace(const Space& space) const;
-  double PeriodicDistance(const Vector &y, const double * const cell_size) const;
-  double PeriodicDistanceSquared(const Vector &y, const double * const cell_size) const;
   double ScalarProduct(const Vector &y) const;
   double Angle(const Vector &y) const;
@@ -58 +57 @@
   Vector Projection(const Vector &y) const;
   void ScaleAll(const double *factor);
+  void ScaleAll(const Vector &factor);
   void Scale(const double factor);
-  void MatrixMultiplication(const double * const M);
-  bool InverseMatrixMultiplication(const double * const M);
-  void KeepPeriodic(const double * const matrix);
   bool GetOneNormalVector(const Vector &x1);
   bool MakeNormalTo(const Vector &y1);
-  bool IsInParallelepiped(const Vector &offset, const double * const parallelepiped) const;
-  void WrapPeriodically(const double * const M, const double * const Minv);
   std::pair<Vector,Vector> partition(const Vector&) const;
   std::pair<pointset,Vector> partition(const pointset&) const;
@@ -79 +74 @@
 
   // Access to internal structure
-  gsl_vector* get();
+  VectorContent* get();
 
   // Methods that are derived directly from other methods
@@ -104 +99 @@
 
 private:
-  gsl_vector *content;
+  Vector(VectorContent *);
+  VectorContent *content;
 
 };