Changes in src/triangleintersectionlist.cpp [d74077:952f38]

File:

• src/triangleintersectionlist.cpp (modified) (5 diffs)

src/triangleintersectionlist.cpp

@@ -15 +15 @@
 #include "triangleintersectionlist.hpp"
 
-#include "BoundaryPointSet.hpp"
-#include "BoundaryLineSet.hpp"
-#include "BoundaryTriangleSet.hpp"
-#include "info.hpp"
+#include "Helpers/Info.hpp"
 #include "tesselation.hpp"
-#include "vector.hpp"
-#include "verbose.hpp"
+#include "LinearAlgebra/Vector.hpp"
+#include "Helpers/Verbose.hpp"
 
 /** Constructor for class TriangleIntersectionList.
  *
  */
-TriangleIntersectionList::TriangleIntersectionList(const Vector &x, const Tesselation *surface, const LinkedCell* LC) :
+TriangleIntersectionList::TriangleIntersectionList(const Vector *x, const Tesselation *surface, const LinkedCell* LC) :
   Point(x),
   Tess(surface),
@@ -73 +70 @@
   }
   // return reference, if none can be found
-  return Point;
+  return *Point;
 };
 
@@ -102 +99 @@
   if (runner != IntersectionList.end()) {
     // if we have found one, check Scalarproduct between the vector
-    Vector TestVector = (Point) - (*(*runner).second);
+    Vector TestVector = (*Point) - (*(*runner).second);
     if (fabs(TestVector.NormSquared()) < MYEPSILON) //
       return true;
@@ -141 +138 @@
     // get intersection with triangle plane
     Intersection = new Vector;
-    (*TriangleRunner)->GetClosestPointInsideTriangle(Point, *Intersection);
-    //Log() << Verbose(1) << "Intersection between " << Point << " and " << **TriangleRunner << " is at " << *Intersection << "." << endl;
+    (*TriangleRunner)->GetClosestPointInsideTriangle(Point, Intersection);
+    //Log() << Verbose(1) << "Intersection between " << *Point << " and " << **TriangleRunner << " is at " << *Intersection << "." << endl;
     IntersectionList.insert( pair<BoundaryTriangleSet *, Vector * > (*TriangleRunner, Intersection) );
   }
@@ -154 +151 @@
   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++)