Changeset 66ce7a for molecuilder

Timestamp:

Aug 19, 2009, 12:22:08 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

6c09a4

Parents:

da84d6

Message:

Replaced Vector::Projection() by Vector::ScalarProduct()

• Projection before was just a return of the Vector::ScalarProduct(). We change it now, to make it return a projected vector, the counterpart to ProjectOntoPlane

Location:

molecuilder/src

Files:

• boundary.cpp (modified) (2 diffs)
• builder.cpp (modified) (2 diffs)
• tesselation.cpp (modified) (5 diffs)
• tesselationhelpers.cpp (modified) (2 diffs)

molecuilder/src/boundary.cpp

@@ -308 +308 @@
 
       //*out << "Checking sign in quadrant : " << ProjectedVector.Projection(&AngleReferenceNormalVector) << "." << endl;
-      if (ProjectedVector.Projection(&AngleReferenceNormalVector) > 0) {
+      if (ProjectedVector.ScalarProduct(&AngleReferenceNormalVector) > 0) {
         angle = 2. * M_PI - angle;
       }
@@ -804 +804 @@
       G = sqrt(((a + b + c) * (a + b + c) - 2 * (a * a + b * b + c * c)) / 16.); // area of tesselated triangle
       x.MakeNormalVector(runner->second->endpoints[0]->node->node, runner->second->endpoints[1]->node->node, runner->second->endpoints[2]->node->node);
-      x.Scale(runner->second->endpoints[1]->node->node->Projection(&x));
+      x.Scale(runner->second->endpoints[1]->node->node->ScalarProduct(&x));
       h = x.Norm(); // distance of CoG to triangle
       PyramidVolume = (1. / 3.) * G * h; // this formula holds for _all_ pyramids (independent of n-edge base or (not) centered peak)

molecuilder/src/builder.cpp

@@ -188 +188 @@
           // remove the projection onto the rotation plane of the second angle
           n.CopyVector(&y);
-          n.Scale(first->x.Projection(&y));
+          n.Scale(first->x.ScalarProduct(&y));
           cout << "N1: ",
           n.Output((ofstream *)&cout);
@@ -197 +197 @@
           cout << endl;
           n.CopyVector(&z);
-          n.Scale(first->x.Projection(&z));
+          n.Scale(first->x.ScalarProduct(&z));
           cout << "N2: ",
           n.Output((ofstream *)&cout);

molecuilder/src/tesselation.cpp

@@ -349 +349 @@
 
   // make it always point inward (any offset vector onto plane projected onto normal vector suffices)
-  if (NormalVector.Projection(&OtherVector) > 0)
+  if (NormalVector.ScalarProduct(&OtherVector) > 0.)
     NormalVector.Scale(-1.);
 };
@@ -737 +737 @@
           TrialVector.CopyVector(checker->second->node->node);
           TrialVector.SubtractVector(A->second->node->node);
-          distance = TrialVector.Projection(&PlaneVector);
+          distance = TrialVector.ScalarProduct(&PlaneVector);
           if (fabs(distance) < 1e-4) // we need to have a small epsilon around 0 which is still ok
             continue;
@@ -897 +897 @@
         TempVector.SubtractVector(baseline->second->endpoints[0]->node->node); // TempVector is vector on triangle plane pointing from one baseline egde towards center!
         //*out << Verbose(2) << "Projection of propagation onto temp: " << PropagationVector.Projection(&TempVector) << "." << endl;
-        if (PropagationVector.Projection(&TempVector) > 0) // make sure normal propagation vector points outward from baseline
+        if (PropagationVector.ScalarProduct(&TempVector) > 0) // make sure normal propagation vector points outward from baseline
           PropagationVector.Scale(-1.);
         *out << Verbose(4) << "PropagationVector of base triangle is " << PropagationVector << endl;
@@ -957 +957 @@
             TempVector.SubtractVector(Center);
             // make it always point outward
-            if (VirtualNormalVector.Projection(&TempVector) < 0)
+            if (VirtualNormalVector.ScalarProduct(&TempVector) < 0)
               VirtualNormalVector.Scale(-1.);
             // calculate angle
@@ -1530 +1530 @@
         AddTesselationLine(TPS[0], TPS[1], 0);
       }
-      cout << Verbose(2) << "Projection is " << BTS->NormalVector.Projection(&Oben) << "." << endl;
+      cout << Verbose(2) << "Projection is " << BTS->NormalVector.ScalarProduct(&Oben) << "." << endl;
     }
     if (BTS != NULL) // we have created one starting triangle

molecuilder/src/tesselationhelpers.cpp

@@ -359 +359 @@
   HeightA.SubtractVector(&par.x1);
 
-  t1 = HeightA.Projection(&SideA)/SideA.ScalarProduct(&SideA);
+  t1 = HeightA.ScalarProduct(&SideA)/SideA.ScalarProduct(&SideA);
 
   SideB.CopyVector(&par.x4);
@@ -366 +366 @@
   HeightB.SubtractVector(&par.x3);
 
-  t2 = HeightB.Projection(&SideB)/SideB.ScalarProduct(&SideB);
+  t2 = HeightB.ScalarProduct(&SideB)/SideB.ScalarProduct(&SideB);
 
   cout << Verbose(2) << "Intersection " << intersection << " is at "