Changeset c43766 for molecuilder/src/boundary.cpp

Timestamp:

Apr 21, 2010, 12:07:01 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

1f2e46

Parents:

7d1633

git-author:

Frederik Heber <heber@…> (04/21/10 11:51:53)

git-committer:

Frederik Heber <heber@…> (04/21/10 12:07:01)

Message:

Rewrite of tesselation: treatment of degenerated triangles and polygons

several tricks have been necessary to make it work for heptane:

• AddDegeneratedTriangle() is not used, instead AddCandidateTriangle() gets told which OptCenter to use, i.e. which triangle side to add
• afterwards, in the case of a polygon (multiple candidates for a baseline) we have to set the candidate of internal edges in the polygon to the next point, such that AddTesselationLine() picks the right one
• The we fill other open lines, needed in case of a degenerated triangle
• If CheckDegeneracy() - which removes all candidates from the ListOfPoints, not just the first - results in true
• Then we call AddCandidateTriangle() for the other side of it
• and again in the case of a polygon, set the candidate for the internal edge accordingly.

• new
  • Tesselation::FindCandidatesforOpenLines() - checks for OpenLines with no candidates and calls FindNextSuitableTriangle() for each
  • Tesselation::FindDegeneratedCandidatesforOpenLines() - sets the candidate of an open line between two points to a given point (for above polygons)
  • enum centers is either Opt or OtherOpt for normal or back side of the triangle, used in AddCandidateTriangle()

• associated changes:
  • Tesselation::CheckDegeneracy() - needs current CandidateForTesselation for Baseline's endpoints and candidate list (not just the current trianglre in TPS), removes these instead of TPS
  • lots of identation changes made by eclipse, bust mostly sensible, due to coding on other laptop before
  • Tesselation::AddCandidateTriangle() - picks OptCenter according to given enum centers
  • Tesselation::AddTesselationLine() - in polygon case, a base line may have multiple candidates, though with same OptCenter, we check all of these against desired ThirdNode
  • FindNonConvexBorder() - removed call of CorrectAllDegeneratedPolygons(), as they should be created correctly now

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

File:

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

molecuilder/src/boundary.cpp

@@ -960 +960 @@
   bool freeLC = false;
   bool status = false;
-  CandidateForTesselation *baseline;
-  LineMap::iterator testline;
+  CandidateForTesselation *baseline = NULL;
   bool OneLoopWithoutSuccessFlag = true;  // marks whether we went once through all baselines without finding any without two triangles
   bool TesselationFailFlag = false;
-  BoundaryTriangleSet *T = NULL;
 
   if (TesselStruct == NULL) {
@@ -997 +995 @@
 
     // 2b. find best candidate for each OpenLine
-    for (CandidateMap::iterator Runner = TesselStruct->OpenLines.begin(); Runner != TesselStruct->OpenLines.end(); Runner++) {
-      baseline = Runner->second;
-      if (baseline->pointlist.empty()) {
-        T = (((baseline->BaseLine->triangles.begin()))->second);
-        Log() << Verbose(1) << "Finding best candidate for open line " << *baseline->BaseLine << " of triangle " << *T << endl;
-        TesselationFailFlag = TesselStruct->FindNextSuitableTriangle(*baseline, *T, RADIUS, LCList); //the line is there, so there is a triangle, but only one.
-      }
-    }
+    TesselationFailFlag = TesselStruct->FindCandidatesforOpenLines(RADIUS, LCList);
 
     // 2c. print OpenLines with candidates again
@@ -1062 +1053 @@
   StoreTrianglesinFile(mol, (const Tesselation *&)TesselStruct, filename, "");
 
-  // correct degenerated polygons
-  TesselStruct->CorrectAllDegeneratedPolygons();
-
-  // check envelope for consistency
-  status = CheckListOfBaselines(TesselStruct);
+//  // correct degenerated polygons
+//  TesselStruct->CorrectAllDegeneratedPolygons();
+//
+//  // check envelope for consistency
+//  status = CheckListOfBaselines(TesselStruct);
 
   // write final envelope