Changeset 1f591b for molecuilder/src/SingleVector.cpp

Timestamp:

Apr 13, 2010, 1:22:42 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

e7ea64

Parents:

0f55b2

Message:

Prepared interface of Vector Class for transition to VectorComposites

File:

• molecuilder/src/SingleVector.cpp (modified) (8 diffs)

molecuilder/src/SingleVector.cpp

@@ -119 +119 @@
         TranslationVector.MatrixMultiplication(matrix);
         // add onto the original vector to compare with
-        Shiftedy.CopyVector(y);
-        Shiftedy.AddVector(&TranslationVector);
+        Shiftedy = y + TranslationVector;
         // get distance and compare with minimum so far
         tmp = Distance(Shiftedy);
@@ -157 +156 @@
         TranslationVector.MatrixMultiplication(matrix);
         // add onto the original vector to compare with
-        Shiftedy.CopyVector(y);
-        Shiftedy.AddVector(&TranslationVector);
+        Shiftedy = y + TranslationVector;
         // get distance and compare with minimum so far
         tmp = DistanceSquared(Shiftedy);
@@ -180 +178 @@
 //  Output(out);
 //  Log() << Verbose(0) << endl;
-  TestVector.CopyVector(this);
+  TestVector = *this;
   TestVector.InverseMatrixMultiplication(matrix);
   for(int i=NDIM;i--;) { // correct periodically
@@ -190 +188 @@
   }
   TestVector.MatrixMultiplication(matrix);
-  CopyVector(&TestVector);
+  CopyVector(TestVector);
 //  Log() << Verbose(2) << "New corrected vector is: ";
 //  Output(out);
@@ -250 +248 @@
 
   // first create part that is orthonormal to PlaneNormal with withdraw
-  temp = *this - PlaneOffset;
+  temp = (*this )- PlaneOffset;
   temp.MakeNormalTo(PlaneNormal);
   temp.Scale(-1.);
   // then add connecting vector from plane to point
-  temp += *this-PlaneOffset;
-  double sign = temp.ScalarProduct(&PlaneNormal);
+  temp += (*this)-PlaneOffset;
+  double sign = temp.ScalarProduct(PlaneNormal);
   if (fabs(sign) > MYEPSILON)
     sign /= fabs(sign);
@@ -271 +269 @@
   Vector helper = y;
   helper.Scale(-(ScalarProduct(y)));
-  AddVector(&helper);
+  AddVector(helper);
 };
 
@@ -556 +554 @@
 {
   bool result = false;
-  double factor = y1.ScalarProduct(this)/y1.NormSquared();
+  double factor = y1.ScalarProduct(*this)/y1.NormSquared();
   Vector x1;
-  x1.CopyVector(&y1);
-  x1.Scale(factor);
-  SubtractVector(&x1);
+  x1 = factor * y1;
+  SubtractVector(x1);
   for (int i=NDIM;i--;)
     result = result || (fabs(x[i]) > MYEPSILON);
@@ -618 +615 @@
 bool SingleVector::IsInParallelepiped(const Vector &offset, const double * const parallelepiped) const
 {
-  Vector a;
-  a.CopyVector(this);
-  a.SubtractVector(&offset);
+  Vector a = (*this) - offset;
   a.InverseMatrixMultiplication(parallelepiped);
   bool isInside = true;