Changeset eda56a for molecuilder/src/tesselation.hpp

Timestamp:

Dec 29, 2009, 2:48:49 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

a1acc5

Parents:

ff4611

Message:

Changes to FindClosest...ToVector() and use of ..Map,..Set,..List defines in tesselation.cpp.

• Search and Replace for all occurences of defines ..Map,..Set,..List in tesselation.cpp to tighten code
• New function Tesselation::FindClosestBoundaryPointsToVector() - replace Find(Second)ClosestPoint()
• New functions Tesselation::FindClosestBoundaryLineToVector() and Tesselation::FindClosesttriangleToVector()
  • old functions FindClosestTriangleToPoint() and FindClosestTrianglesToPoint() start looking from BoundaryPoints only and thus might find a triangle being closer which we see from the wrong side
• added unit test TesselationInOutsideUnitTest - checks IsInnerPoint and containments
• adapated unit test TesselationUnitTest - checks tesselation only

File:

• molecuilder/src/tesselation.hpp (modified) (3 diffs)

molecuilder/src/tesselation.hpp

@@ -52 +52 @@
 // ======================================================= some template functions =========================================
 
+#define IndexToIndex map <int, int>
+
 #define PointMap map < int, class BoundaryPointSet * >
 #define PointSet set < class BoundaryPointSet * >
@@ -76 +78 @@
 #define PolygonSet set < class BoundaryPolygonSet * >
 #define PolygonList list < class BoundaryPolygonSet * >
+
+#define DistanceMap multimap <double, class BoundaryPointSet * >
+#define DistancePair pair <double, class BoundaryPointSet * >
 
 #define DistanceMultiMap multimap <double, pair < PointMap::iterator, PointMap::iterator> >
@@ -310 +315 @@
     bool IsInnerPoint(const TesselPoint * const Point, const LinkedCell* const LC, const double epsilon = -MYEPSILON) const;
     bool AddBoundaryPoint(TesselPoint * Walker, const int n);
-    TesselPoint* FindSecondClosestBoundaryPoint(const Vector* Point, const LinkedCell* const LC) const;
-    TesselPoint* FindClosestBoundaryPoint(const Vector* Point, TesselPoint *&SecondPoint, const LinkedCell* const LC) const;
+    DistanceMap * FindClosestBoundaryPointsToVector(const Vector *x, const LinkedCell* LC) const;
+    BoundaryLineSet * FindClosestBoundaryLineToVector(const Vector *x, const LinkedCell* LC) const;
+    TriangleList * FindClosestTrianglesToVector(const Vector *x, const LinkedCell* LC) const;
+    BoundaryTriangleSet* FindClosestTriangleToVector(const Vector *x, const LinkedCell* LC) const;
 
     // print for debugging