Changeset 8f9a8e

Timestamp:

Aug 7, 2009, 9:12:19 AM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

0fc0b5

Parents:

e1a46d

Message:

FIX: We have to check whether we create a degenerate triangle also on its first occurence! I.e. in all cases we don't want to create two lines in place were one is already with two triangles attached.

This fixed a bug with cholesterol immediately.

File:

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

molecuilder/src/tesselation.cpp

@@ -1101 +1101 @@
 ;
 
-
-
 /** Checks whether the triangle consisting of the three points is already present.
  * Searches for the points in Tesselation::PointsOnBoundary and checks their
@@ -1327 +1325 @@
   cout << Verbose(0) << "Begin of Find_next_suitable_triangle\n";
   bool result = true;
+  bool degenerateTriangle = false;
   CandidateList *Opt_Candidates = new CandidateList();
 
@@ -1423 +1422 @@
       AddTrianglePoint(BaseRay->endpoints[1]->node, 2);
 
-      AddTriangleLine(TPS[0], TPS[1], 0);
-      AddTriangleLine(TPS[0], TPS[2], 1);
-      AddTriangleLine(TPS[1], TPS[2], 2);
-
-      BTS = new class BoundaryTriangleSet(BLS, TrianglesOnBoundaryCount);
-      AddTriangle();
-      (*it)->OptCenter.Scale(-1.);
-      BTS->GetNormalVector((*it)->OptCenter);
-      (*it)->OptCenter.Scale(-1.);
-
-      cout << "--> New triangle with " << *BTS << " and normal vector " << BTS->NormalVector
-        << " for this triangle ... " << endl;
+      if (CheckLineCriteriaforDegeneratedTriangle(TPS)) {
+        AddTriangleLine(TPS[0], TPS[1], 0);
+        AddTriangleLine(TPS[0], TPS[2], 1);
+        AddTriangleLine(TPS[1], TPS[2], 2);
+
+        BTS = new class BoundaryTriangleSet(BLS, TrianglesOnBoundaryCount);
+        AddTriangle();
+        (*it)->OptCenter.Scale(-1.);
+        BTS->GetNormalVector((*it)->OptCenter);
+        (*it)->OptCenter.Scale(-1.);
+
+        cout << "--> New triangle with " << *BTS << " and normal vector " << BTS->NormalVector
+          << " for this triangle ... " << endl;
       //cout << Verbose(1) << "We have "<< TrianglesOnBoundaryCount << " for line " << *BaseRay << "." << endl;
+      } else {
+        cout << Verbose(1) << "WARNING: This triangle consisting of ";
+        cout << *(*it)->point << ", ";
+        cout << *BaseRay->endpoints[0]->node << " and ";
+        cout << *BaseRay->endpoints[1]->node << " ";
+        cout << "exists and is not added, as it does not seem helpful!" << endl;
+        result = false;
+      }
     } else if (existentTrianglesCount == 1) { // If there is a planar region within the structure, we need this triangle a second time.
         AddTrianglePoint((*it)->point, 0);
@@ -1449 +1457 @@
 
           BTS = new class BoundaryTriangleSet(BLS, TrianglesOnBoundaryCount);
-          AddTriangle();
+          AddTriangle();  // add to global map
 
           (*it)->OtherOptCenter.Scale(-1.);
@@ -1802 +1810 @@
 
                 // check for three unique points
-                //cout << Verbose(2) << "INFO: Current Candidate is " << *Candidate << " at " << Candidate->x << "." << endl;
+                //cout << Verbose(2) << "INFO: Current Candidate is " << *Candidate << " at " << Candidate->node << "." << endl;
                 if ((Candidate != BaseLine->endpoints[0]->node) && (Candidate != BaseLine->endpoints[1]->node) ){
 
@@ -1863 +1871 @@
                       } else {
                         if ((optCandidate != NULL) && (optCandidate->point != NULL)) {
-                          //cout << Verbose(2) << "REJECT: Old candidate: " << *(optCandidate->point) << " is better than " << alpha << " with " << *ShortestAngle << "." << endl;
+                          //cout << Verbose(2) << "REJECT: Old candidate " << *(optCandidate->point) << " with " << *ShortestAngle << " is better than new one " << *Candidate << " with " << alpha << " ." << endl;
                         } else {
                           //cout << Verbose(2) << "REJECT: Candidate " << *Candidate << " with " << alpha << " was rejected." << endl;
@@ -1870 +1878 @@
 
                     } else {
-                      //cout << Verbose(2) << "REJECT: NewSphereCenter " << NewSphereCenter << " is too far away: " << radius << "." << endl;
+                      //cout << Verbose(2) << "REJECT: NewSphereCenter " << NewSphereCenter << " for " << *Candidate << " is too far away: " << radius << "." << endl;
                     }
                   } else {