Changeset daf5d6 for molecuilder/src/builder.cpp

Timestamp:

Aug 19, 2009, 12:30:21 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

78dac6

Parents:

27459a (diff), 6c09a4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'VectorUnitTest' into ConcaveHull

File:

• molecuilder/src/builder.cpp (modified) (2 diffs)

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);