Changeset 1f591b for molecuilder/src/vector_ops.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/vector_ops.cpp (modified) (5 diffs)

molecuilder/src/vector_ops.cpp

@@ -121 +121 @@
   // normalise this vector with respect to axis
   a.CopyVector(vec);
-  a.ProjectOntoPlane(&axis);
+  a.ProjectOntoPlane(axis);
   // construct normal vector
   try {
@@ -135 +135 @@
   y.Scale(sin(alpha));
   a.Scale(cos(alpha));
-  res = vec.Projection(&axis);
+  res = vec.Projection(axis);
   // add scaled normal vector onto this vector
-  res.AddVector(&y);
+  res += y;
   // add part in axis direction
-  res.AddVector(&a);
+  res += a;
   return res;
 };
@@ -197 +197 @@
   Vector parallel;
   double factor = 0.;
-  if (fabs(a.ScalarProduct(&b)*a.ScalarProduct(&b)/a.NormSquared()/b.NormSquared() - 1.) < MYEPSILON) {
+  if (fabs(a.ScalarProduct(b)*a.ScalarProduct(b)/a.NormSquared()/b.NormSquared() - 1.) < MYEPSILON) {
     parallel = Line1a - Line2a;
-    factor = parallel.ScalarProduct(&a)/a.Norm();
+    factor = parallel.ScalarProduct(a)/a.Norm();
     if ((factor >= -MYEPSILON) && (factor - 1. < MYEPSILON)) {
       res = Line2a;
@@ -206 +206 @@
     } else {
       parallel = Line1a - Line2b;
-      factor = parallel.ScalarProduct(&a)/a.Norm();
+      factor = parallel.ScalarProduct(a)/a.Norm();
       if ((factor >= -MYEPSILON) && (factor - 1. < MYEPSILON)) {
         res = Line2b;
@@ -221 +221 @@
   double s;
   Vector temp1, temp2;
-  temp1.CopyVector(&c);
-  temp1.VectorProduct(&b);
-  temp2.CopyVector(&a);
-  temp2.VectorProduct(&b);
+  temp1 = c;
+  temp1.VectorProduct(b);
+  temp2 = a;
+  temp2.VectorProduct(b);
   Log() << Verbose(1) << "INFO: temp1 = " << temp1 << ", temp2 = " << temp2 << "." << endl;
   if (fabs(temp2.NormSquared()) > MYEPSILON)
-    s = temp1.ScalarProduct(&temp2)/temp2.NormSquared();
+    s = temp1.ScalarProduct(temp2)/temp2.NormSquared();
   else
     s = 0.;
-  Log() << Verbose(1) << "Factor s is " << temp1.ScalarProduct(&temp2) << "/" << temp2.NormSquared() << " = " << s << "." << endl;
+  Log() << Verbose(1) << "Factor s is " << temp1.ScalarProduct(temp2) << "/" << temp2.NormSquared() << " = " << s << "." << endl;
 
   // construct intersection