Changeset 0d111b for molecuilder/src/triangleintersectionlist.cpp

Timestamp:

Apr 29, 2010, 1:55:21 PM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

070651, 5d1a94

Parents:

90c4460 (diff), 32842d8 (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 'VectorRefactoring' into StructureRefactoring

Conflicts:

molecuilder/src/Legacy/oldmenu.cpp
molecuilder/src/Makefile.am
molecuilder/src/analysis_correlation.cpp
molecuilder/src/boundary.cpp
molecuilder/src/builder.cpp
molecuilder/src/config.cpp
molecuilder/src/ellipsoid.cpp
molecuilder/src/linkedcell.cpp
molecuilder/src/molecule.cpp
molecuilder/src/molecule_fragmentation.cpp
molecuilder/src/molecule_geometry.cpp
molecuilder/src/molecule_graph.cpp
molecuilder/src/moleculelist.cpp
molecuilder/src/tesselation.cpp
molecuilder/src/tesselationhelpers.cpp
molecuilder/src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp
molecuilder/src/unittests/bondgraphunittest.cpp
molecuilder/src/vector.cpp
molecuilder/src/vector.hpp

File:

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

molecuilder/src/triangleintersectionlist.cpp

@@ -94 +94 @@
   if (runner != IntersectionList.end()) {
     // if we have found one, check Scalarproduct between the vector
-    Vector TestVector(Point);
-    TestVector.SubtractVector((*runner).second);
+    Vector TestVector = (*Point) - (*(*runner).second);
     if (fabs(TestVector.NormSquared()) < MYEPSILON) //
       return true;
-    const double sign = (*runner).first->NormalVector.ScalarProduct(&TestVector);
+    const double sign = (*runner).first->NormalVector.ScalarProduct(TestVector);
     if (sign < 0) {
       return true;
@@ -147 +146 @@
   if (DistanceList.empty())
     for (TriangleVectorMap::const_iterator runner = IntersectionList.begin(); runner != IntersectionList.end(); runner++)
-      DistanceList.insert( pair<double, BoundaryTriangleSet *> (Point->Distance((*runner).second), (*runner).first) );
+      DistanceList.insert( pair<double, BoundaryTriangleSet *> (Point->Distance(*(*runner).second), (*runner).first) );
 
   //for (DistanceTriangleMap::const_iterator runner = DistanceList.begin(); runner != DistanceList.end(); runner++)