Changeset 2dff2d for molecuilder/src/tesselationhelpers.cpp

Timestamp:

Nov 28, 2009, 3:07:42 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

1db34af

Parents:

f7490d

git-author:

Frederik Heber <heber@…> (11/28/09 14:58:40)

git-committer:

Frederik Heber <heber@…> (11/28/09 15:07:42)

Message:

Correction of degenerated polygons is working.

• Correction of degenerated polygons:
  • incorporated into FindNonConvexBorder()
  • verbosity added: BoundaryPolygonSet::GetCenter(), BoundaryPolygonSet::ContainsBoundaryLine(), BoundaryPolygonSet::ContainsBoundaryPoint(), BoundaryPolygonSet::ContainsPresentTupel(), Tesselation::AddTesselationLine(), Tesselation::CorrectAllDegeneratedPolygons(), ArePolygonsEdgeConnected()
  • renamed function BoundaryPolygonSet::GetAllTrianglesFromEndpoints() to GetAllContainedTrianglesFromEndpoints() (as it only returns triangles whose endpoints are _all_ in the BoundaryPolygonset)
  • BoundaryPolygonSet::FillPolygonFromTrianglesOfLine() does not strictly return four or NULL endpoints, as it makes subsequent success checks (and verbose output of failure) harder.
  • FIX: Tesselation::RemoveTesselationTriangle() adds line to Tesselation::OpenLines of still attached to other triangle.
  • new struct BoundaryLineSetCompare(), that compares BoundaryLineSet's
  • new struct BoundaryPolygonSetCompare(), that compares BoundaryPolygonSet's
  • FIX: lots of small fixes to Tesselation::CorrectAllDegeneratedPolygons(): new backside triangles were not added to LinesOnBoundary, when joining adjacent polygons triangles were gathered from Four instead of current PolygonRunner, other combination was not added to SimplyDegeneratedTriangles
  • FIX: CountTrianglePairContainingPolygon() - PairTrianglesnodes instead of TriangleNodes was clear()'ed.

• BUGFIX: FindAllDegeneratedLines() did not find the correct lines due to wrong comparison. Now we use a set with the comparator BoundaryLineSetCompare().
• valgrind runs through fine.

Signed-off-by: Frederik Heber <heber@…>

File:

• molecuilder/src/tesselationhelpers.cpp (modified) (3 diffs)

molecuilder/src/tesselationhelpers.cpp

@@ -956 +956 @@
   }
 
+  Log() << Verbose(0) << "Polygon is " << *P << endl;
   // create each pair, get the endpoints and check whether *P is contained.
   int counter = 0;
@@ -969 +970 @@
         for (int i=0;i<3;i++)
           PairTrianglenodes.endpoints.insert((*PairWalker)->endpoints[i]);
-        Log() << Verbose(1) << "Current pair of triangles: " << PairTrianglenodes << "." << endl;
-        // now check
-        if (PairTrianglenodes.ContainsPresentTupel(P)) {
-          counter++;
-          Log() << Verbose(1) << "Matches with " << *P << endl;
+        const int size = PairTrianglenodes.endpoints.size();
+        if (size == 4) {
+          Log() << Verbose(0) << " Current pair of triangles: " << **Walker << "," << **PairWalker << " with " << size << " distinct endpoints:" << PairTrianglenodes << endl;
+          // now check
+          if (PairTrianglenodes.ContainsPresentTupel(P)) {
+            counter++;
+            Log() << Verbose(0) << "  ACCEPT: Matches with " << *P << endl;
+          } else {
+            Log() << Verbose(0) << "  REJECT: No match with " << *P << endl;
+          }
         } else {
-          Log() << Verbose(1) << "No match with " << *P << endl;
+          Log() << Verbose(0) << "  REJECT: Less than four endpoints." << endl;
         }
       }
     }
-    PairTrianglenodes.endpoints.clear();
+    Trianglenodes.clear();
   }
   return counter;
@@ -1010 +1016 @@
 {
   Info FunctionInfo(__func__);
-  for(PointSet::iterator Runner = P1->endpoints.begin(); Runner != P1->endpoints.end(); Runner++) {
-    P1->endpoints.insert((*Runner));
+  pair <PointSet::iterator, bool> Tester;
+  for(PointSet::iterator Runner = P2->endpoints.begin(); Runner != P2->endpoints.end(); Runner++) {
+    Tester = P1->endpoints.insert((*Runner));
+    if (Tester.second)
+      Log() << Verbose(0) << "Inserting endpoint " << *(*Runner) << " into first polygon." << endl;
   }
   P2->endpoints.clear();