Changeset d11f22

Timestamp:

Jun 10, 2008, 11:11:22 AM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

c4a0a2

Parents:

32b6dc

Message:

some new functions: vector::vector(), vector::ProjectOntoPlane(), vector::One(), vector::Init()

vector::vector(): another constructor for directly initiating vector
vector::ProjectOntoPlane(): projects a vector onto the planbe defined by a given normal vector
vector::One(): set all components to 1
vector::Init(): initialises vector with given components

Files:

• m4/ac_doxygen.m4 (added)
• molecuilder/src/vector.cpp (modified) (4 diffs)
• molecuilder/src/vector.hpp (modified) (2 diffs)

molecuilder/src/vector.cpp

@@ -13 +13 @@
  */
 vector::vector() { x[0] = x[1] = x[2] = 0.; };
+
+/** Constructor of class vector.
+ */
+vector::vector(double x1, double x2, double x3) { x[0] = x1; x[1] = x2; x[2] = x3; };
 
 /** Desctructor of class vector.
@@ -111 +115 @@
 };
 
+/** projects this vector onto plane defined by \a *y.
+ * \param *y array to normal vector of plane
+ * \return \f$\langle x, y \rangle\f$
+ */
+void vector::ProjectOntoPlane(const vector *y)
+{
+  vector tmp;
+  tmp.CopyVector(y);
+  tmp.Scale(Projection(y));
+  this->SubtractVector(&tmp);
+};
+
 /** Calculates the projection of a vector onto another \a *y.
  * \param *y array to second vector
@@ -117 +133 @@
 double vector::Projection(const vector *y) const
 {
-  return (ScalarProduct(y)/Norm()/y->Norm());
+  return (ScalarProduct(y));
 };
 
@@ -150 +166 @@
 };
 
+/** Zeros all components of this vector.
+ */
+void vector::One(double one)
+{
+  for (int i=NDIM;i--;)
+    this->x[i] = one;
+};
+
+/** Initialises all components of this vector.
+ */
+void vector::Init(double x1, double x2, double x3)
+{ 
+  x[0] = x1;
+  x[1] = x2;
+  x[2] = x3;
+};
+
 /** Calculates the angle between this and another vector.
  * \param *y array to second vector
- * \return \f$\frac{\langle x, y \rangle}{|x||y|}\f$
+ * \return \f$\acos\bigl(frac{\langle x, y \rangle}{|x||y|}\bigr)\f$
  */
 double vector::Angle(vector *y) const
 {
-  return (this->ScalarProduct(y)/(this->Norm()*y->Norm()));
+  return acos(this->ScalarProduct(y)/Norm()/y->Norm()); 
 };
 

molecuilder/src/vector.hpp

@@ -10 +10 @@
 
   vector();
+  vector(double x1, double x2, double x3);
   ~vector();
 
@@ -23 +24 @@
   void CopyVector(const vector *y);
   void RotateVector(const vector *y, const double alpha);
-  void Zero(); 
+  void Zero();
+  void One(double one = 1.);
+  void Init(double x1, double x2, double x3);
   void Normalize();
   void Translate(const vector *x);
   void Mirror(const vector *x);
+  void ProjectOntoPlane(const vector *y);
   void Scale(double **factor);
   void Scale(double *factor);