Changeset d22a30 for molecuilder

Timestamp:

Apr 22, 2010, 2:07:14 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

fda112

Parents:

2cd534

Message:

small changes to tesselation.

• Tesselation::FindDegeneratedCandidatesforOpenLines() - sets CandidateLine::T to Tesselation::BTS, being the last added triangle.
• Tesselation::AddCandidatePolygon() - remark about above added to call of function
• Tesselation::FindCandidatesforOpenLines() - added assert to check that there is only one triangle attached to this CandidateForTesselation::baseline

File:

• molecuilder/src/tesselation.cpp (modified) (4 diffs)

molecuilder/src/tesselation.cpp

@@ -7 +7 @@
 
 #include <fstream>
+#include <assert.h>
 
 #include "helpers.hpp"
@@ -2538 +2539 @@
     baseline = Runner->second;
     if (baseline->pointlist.empty()) {
+      assert((baseline->BaseLine->triangles.size() == 1) && ("Open line without exactly one attached triangle"));
       T = (((baseline->BaseLine->triangles.begin()))->second);
       DoLog(1) && (Log() << Verbose(1) << "Finding best candidate for open line " << *baseline->BaseLine << " of triangle " << *T << endl);
@@ -2590 +2592 @@
     if (Sprinter != connectedClosestPoints->end()) {
       // fill the internal open lines with its respective candidate (otherwise lines in degenerate case are not picked)
-      FindDegeneratedCandidatesforOpenLines(*Sprinter, &CandidateLine.OptCenter);
+      FindDegeneratedCandidatesforOpenLines(*Sprinter, &CandidateLine.OptCenter); // Assume BTS contains last triangle
       DoLog(0) && (Log() << Verbose(0) << " There are still more triangles to add." << endl);
     }
@@ -2631 +2633 @@
       else {
         DoLog(1) && (Log() << Verbose(1) << "INFO: line " << *(FindLine->second) << " is open with no candidate, setting to next Sprinter" << (*Sprinter) << endl);
+        Finder->second->T = BTS;  // is last triangle
         Finder->second->pointlist.push_back(Sprinter);
         Finder->second->ShortestAngle = 0.;