Changeset 725869 for molecuilder/src/vector.cpp

Timestamp:

May 21, 2008, 9:24:54 AM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

33c05d

Parents:

e9c14d

Message:

new header file for the vector class, new operators +=,*=,*,+

File:

• molecuilder/src/vector.cpp (modified) (4 diffs)

molecuilder/src/vector.cpp

@@ -182 +182 @@
 };
 
+/** Sums vector \a to this lhs component-wise.
+ * \param a base vector
+ * \param b vector components to add
+ * \return lhs + a
+ */
+vector& operator+=(vector& a, const vector& b)
+{
+  a.AddVector(&b);
+  return a;
+};
+/** factor each component of \a a times a double \a m.
+ * \param a base vector
+ * \param m factor
+ * \return lhs.x[i] * m
+ */
+vector& operator*=(vector& a, const double m)
+{
+  a.Scale(m);
+  return a;
+};
+
+/** Sums two vectors \a  and \b component-wise.
+ * \param a first vector 
+ * \param b second vector
+ * \return a + b
+ */
+vector& operator+(const vector& a, const vector& b)
+{
+  vector *x = new vector;
+  x->CopyVector(&a);
+  x->AddVector(&b);
+  return *x;
+};
+
+/** Factors given vector \a a times \a m.
+ * \param a vector 
+ * \param m factor
+ * \return a + b
+ */
+vector& operator*(const vector& a, const double m)
+{
+  vector *x = new vector;
+  x->CopyVector(&a);
+  x->Scale(m);
+  return *x;
+};
+
 /** Prints a 3dim vector.
  * prints no end of line.
@@ -213 +260 @@
 {
   for (int i=0;i<NDIM;i++)
-    this->x[i] *= (*factor)[i];
+    x[i] *= (*factor)[i];
 };
 
@@ -219 +266 @@
 {
   for (int i=0;i<NDIM;i++)
-    this->x[i] *= *factor;
+    x[i] *= *factor;
 };
 
@@ -225 +272 @@
 {
   for (int i=0;i<NDIM;i++)
-    this->x[i] *= factor;
+    x[i] *= factor;
 };