Changeset e08f45 for molecuilder/src/vector.hpp

Timestamp:

Feb 9, 2009, 5:24:10 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

451d7a

Parents:

4aef8a

git-author:

Frederik Heber <heber@…> (02/09/09 15:55:37)

git-committer:

Frederik Heber <heber@…> (02/09/09 17:24:10)

Message:

Merge branch 'ConcaveHull' of ../espack2 into ConcaveHull

Conflicts:

molecuilder/src/boundary.cpp
molecuilder/src/boundary.hpp
molecuilder/src/builder.cpp
molecuilder/src/linkedcell.cpp
molecuilder/src/linkedcell.hpp
molecuilder/src/vector.cpp
molecuilder/src/vector.hpp
util/src/NanoCreator.c

Basically, this resulted from a lot of conversions two from spaces to one tab, which is my standard indentation. The mess was caused by eclipse auto-indenting. And in espack2:ConcaveHull was the new stuff, so all from ConcaveHull was replaced in case of doubt.
Additionally, vector had ofstream << operator instead ostream << ...

File:

• molecuilder/src/vector.hpp (modified) (1 diff, 1 prop)

molecuilder/src/vector.hpp

@@ -8 +8 @@
  */
 class Vector {
-  public:
-    double x[NDIM];
+        public:
+                double x[NDIM];
 
-  Vector();
-  Vector(double x1, double x2, double x3);
-  ~Vector();
+        Vector();
+        Vector(double x1, double x2, double x3);
+        ~Vector();
 
-  double Distance(const Vector *y) const;
-  double DistanceSquared(const Vector *y) const;
-  double PeriodicDistance(const Vector *y, const double *cell_size) const;
-  double ScalarProduct(const Vector *y) const;
-  double Projection(const Vector *y) const;
-  double Norm() const ;
-  double Angle(Vector *y) const;
+        double Distance(const Vector *y) const;
+        double DistanceSquared(const Vector *y) const;
+        double PeriodicDistance(const Vector *y, const double *cell_size) const;
+        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 Angle(const Vector *y) const;
 
-  void AddVector(const Vector *y);
-  void SubtractVector(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 Zero();
-  void One(double one);
-  void Init(double x1, double x2, double x3);
-  void Normalize();
-  void Translate(const Vector *x);
-  void Mirror(const Vector *x);
-  void Scale(double **factor);
-  void Scale(double *factor);
-  void Scale(double factor);
-  void MatrixMultiplication(double *M);
-  void InverseMatrixMultiplication(double *M);
-  void KeepPeriodic(ofstream *out, double *matrix);
-  void LinearCombinationOfVectors(const Vector *x1, const Vector *x2, const Vector *x3, double *factors);
-
-  double CutsPlaneAt(Vector *A, Vector *B, Vector *C);
-  bool GetOneNormalVector(const Vector *x1);
-  bool MakeNormalVector(const Vector *y1);
-  bool MakeNormalVector(const Vector *y1, const Vector *y2);
-  bool MakeNormalVector(const Vector *x1, const Vector *x2, const Vector *x3);
-  bool SolveSystem(Vector *x1, Vector *x2, Vector *y, double alpha, double beta, double c);
-  bool LSQdistance(Vector **vectors, int dim);
-
-  void AskPosition(double *cell_size, bool check);
-  bool Output(ofstream *out) const;
+        void AddVector(const Vector *y);
+        void SubtractVector(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 Zero();
+        void One(double one);
+        void Init(double x1, double x2, double x3);
+        void Normalize();
+        void Translate(const Vector *x);
+        void Mirror(const Vector *x);
+        void Scale(double **factor);
+        void Scale(double *factor);
+        void Scale(double factor);
+        void MatrixMultiplication(double *M);
+        void InverseMatrixMultiplication(double *M);
+        void KeepPeriodic(ofstream *out, double *matrix);
+        void LinearCombinationOfVectors(const Vector *x1, const Vector *x2, const Vector *x3, double *factors);
+        double CutsPlaneAt(Vector *A, Vector *B, Vector *C);
+        bool GetOneNormalVector(const Vector *x1);
+        bool MakeNormalVector(const Vector *y1);
+        bool MakeNormalVector(const Vector *y1, const Vector *y2);
+        bool MakeNormalVector(const Vector *x1, const Vector *x2, const Vector *x3);
+        bool SolveSystem(Vector *x1, Vector *x2, Vector *y, double alpha, double beta, double c);
+        bool LSQdistance(Vector **vectors, int dim);
+        void AskPosition(double *cell_size, bool check);
+        bool Output(ofstream *out) const;
 };
 
-ofstream& operator<<(ofstream& ost, 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);
+ostream & operator << (ostream& ost, 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);
 
 #endif /*VECTOR_HPP_*/