Changeset 447896 for molecuilder/src

Timestamp:

Apr 22, 2010, 2:13:32 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

424d3fe

Parents:

fda112

Message:

BUGFIX of Tesselation::AddTesselationLine() - comparing Vector against Vector is numerically unstable.

• Instead of checking the Vector of both Centers by operator==, we use DistanceSquared().
• This fixes a bug in tesselating bpti with radius 1.5, where three lines remained open due to not being correctly associated with their degenerated other sides.

File:

• molecuilder/src/tesselation.cpp (modified) (1 diff)

molecuilder/src/tesselation.cpp

@@ -1800 +1800 @@
         // get open line
         for (TesselPointList::const_iterator CandidateChecker = Finder->second->pointlist.begin(); CandidateChecker != Finder->second->pointlist.end(); ++CandidateChecker) {
-          if ((*(CandidateChecker) == candidate->node) && (OptCenter == NULL || *OptCenter == Finder->second->OptCenter)) { // stop searching if candidate matches
+          if ((*(CandidateChecker) == candidate->node) && (OptCenter == NULL || OptCenter->DistanceSquared(&Finder->second->OptCenter) < MYEPSILON )) { // stop searching if candidate matches
+            DoLog(1) && (Log() << Verbose(1) << "ACCEPT: Candidate " << *(*CandidateChecker) << " has the right center " << Finder->second->OptCenter << "." << endl);
             insertNewLine = false;
             WinningLine = FindLine->second;
             break;
+          } else {
+            DoLog(1) && (Log() << Verbose(1) << "REJECT: Candidate " << *(*CandidateChecker) << "'s center " << Finder->second->OptCenter << " does not match desired on " << *OptCenter << "." << endl);
           }
         }