Changeset daf956 for molecuilder/src/tesselation.cpp

Timestamp:

Oct 2, 2009, 3:19:51 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

e1f6d7

Parents:

fca6e7

Message:

Fixes to the (Non)ConvexTesselation, working with 1_2_dimethoxyethylene

minor changes:

• BoundaryLineSet::CheckConvexityCriterion() reduced verbosity
• CalculateConcavityPerBoundaryPoint() moved to tesselationhelpers.cpp
• FindNonConvexBorder(): flag -> OneLoopWithoutSuccessFlag, failflag -> TesselationFailFlag, N removed
• FindNonConvexBorder() - CheckListOfBaseline() used before and after insertion of straddling points
• BoundaryTriangleSet::ContainsBoundaryPoint() overloaded function to check also for TesselPoint
• Tesselation::InsertStraddlingPoints() - LinkedCell only redone when point was added
• Tesselation::AddTesselationTriangle() - overloaded function to set index of triangle directly.
• new function CheckListOfBaselines() - outsourced from FindNonConvexBorder()

major changes:

• BUGFIX: FindNonConvexBorder() - increment of baseline was missing
• third step (Flipping baselines) removed from ConvexizeNonconvexEnvelope()
• BUGFIX: BoundaryTriangleSet::GetIntersectionInsideTriangle() < should have been > in final if-statement to check whether in- or outside
• Tesselation::InsertStraddlingPoints() - behavior of FindClosestTriangle() changed, hence we have to check whether returned triangle does not contain the point in question.
• BUGFIX: Tesselation::FlipBaseline() - did not change LastTriangle which caused crashes on writing envelope, as it pointed to delete memory

File:

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

molecuilder/src/tesselation.cpp

@@ -215 +215 @@
     node = runner->second->GetThirdEndpoint(this);
     if (node != NULL) {
-      *out << Verbose(3) << "INFO: Third node for triangle " << *(runner->second) << " is " << *node << " at " << *(node->node->node) << "." << endl;
+      //*out << Verbose(3) << "INFO: Third node for triangle " << *(runner->second) << " is " << *node << " at " << *(node->node->node) << "." << endl;
       helper[i].CopyVector(node->node->node);
       helper[i].SubtractVector(&BaseLineCenter);
       helper[i].MakeNormalVector(&BaseLine);  // we want to compare the triangle's heights' angles!
-      *out << Verbose(4) << "INFO: Height vector with respect to baseline is " << helper[i] << "." << endl;
+      //*out << Verbose(4) << "INFO: Height vector with respect to baseline is " << helper[i] << "." << endl;
       i++;
     } else {
@@ -226 +226 @@
     }
   }
-  *out << Verbose(3) << "INFO: BaselineNormal is " << BaseLineNormal << "." << endl;
+  //*out << Verbose(3) << "INFO: BaselineNormal is " << BaseLineNormal << "." << endl;
   if (NormalCheck.NormSquared() < MYEPSILON) {
     *out << Verbose(3) << "ACCEPT: Normalvectors of both triangles are the same: convex." << endl;
@@ -374 +374 @@
  * We call Vector::GetIntersectionWithPlane() to receive the intersection point with the plane
  * This we test if it's really on the plane and whether it's inside the triangle on the plane or not.
- * The latter is done as follows: if it's really outside, then for any endpoint of the triangle and it's opposite
- * base line, the intersection between the line from endpoint to intersection and the base line will have a Vector::NormSquared()
- * smaller than the first line.
+ * The latter is done as follows: We calculate the cross point of one of the triangle's baseline with the line
+ * given by the intersection and the third basepoint. Then, we check whether it's on the baseline (i.e. between
+ * the first two basepoints) or not.
  * \param *out output stream for debugging
  * \param *MolCenter offset vector of line
@@ -408 +408 @@
     exit(255);
   }
-  CrossPoint.SubtractVector(endpoints[i%3]->node->node);
+  CrossPoint.SubtractVector(endpoints[i%3]->node->node);  // cross point was returned as absolute vector
 
   // check whether intersection is inside or not by comparing length of intersection and length of cross point
-  if ((CrossPoint.NormSquared() - helper.NormSquared()) > -MYEPSILON) { // inside
+  if ((CrossPoint.NormSquared() - helper.NormSquared()) < MYEPSILON) { // inside
     return true;
   } else { // outside!
@@ -439 +439 @@
   for(int i=0;i<3;i++)
     if (point == endpoints[i])
+      return true;
+  return false;
+};
+
+/** Checks whether point is any of the three endpoints this triangle contains.
+ * \param *point TesselPoint to test
+ * \return true - point is of the triangle, false - is not
+ */
+bool BoundaryTriangleSet::ContainsBoundaryPoint(class TesselPoint *point)
+{
+  for(int i=0;i<3;i++)
+    if (point == endpoints[i]->node)
       return true;
   return false;
@@ -1088 +1100 @@
   Vector *Center = cloud->GetCenter(out);
   list<BoundaryTriangleSet*> *triangles = NULL;
+  bool AddFlag = false;
+  LinkedCell *BoundaryPoints = NULL;
 
   *out << Verbose(1) << "Begin of InsertStraddlingPoints" << endl;
 
   cloud->GoToFirst();
+  BoundaryPoints = new LinkedCell(this, 5.);
   while (!cloud->IsEnd()) {  // we only have to go once through all points, as boundary can become only bigger
-    LinkedCell BoundaryPoints(this, 5.);
+    if (AddFlag) {
+      delete(BoundaryPoints);
+      BoundaryPoints = new LinkedCell(this, 5.);
+      AddFlag = false;
+    }
     Walker = cloud->GetPoint();
     *out << Verbose(2) << "Current point is " << *Walker << "." << endl;
     // get the next triangle
-    triangles = FindClosestTrianglesToPoint(out, Walker->node, &BoundaryPoints);
-    if (triangles == NULL) {
-      *out << Verbose(1) << "No triangles found, probably a tesselation point itself." << endl;
+    triangles = FindClosestTrianglesToPoint(out, Walker->node, BoundaryPoints);
+    BTS = triangles->front();
+    if ((triangles == NULL) || (BTS->ContainsBoundaryPoint(Walker))) {
+      *out << Verbose(2) << "No triangles found, probably a tesselation point itself." << endl;
       cloud->GoToNext();
       continue;
     } else {
-      BTS = triangles->front();
     }
     *out << Verbose(2) << "Closest triangle is " << *BTS << "." << endl;
@@ -1126 +1145 @@
         // add Walker to boundary points
         *out << Verbose(2) << "Adding " << *Walker << " to BoundaryPoints." << endl;
+        AddFlag = true;
         if (AddBoundaryPoint(Walker,0))
           NewPoint = BPS[0];
@@ -1279 +1299 @@
 };
 
-/** Function tries to add Triangle just created to Triangle and remarks if already existent (Failure of algorithm).
- * Furthermore it adds the triangle to all of its lines, in order to recognize those which are saturated later.
+/** Function adds triangle to global list.
+ * Furthermore, the triangle receives the next free id and id counter \a TrianglesOnBoundaryCount is increased.
  */
 void Tesselation::AddTesselationTriangle()
@@ -1289 +1309 @@
   TrianglesOnBoundary.insert(TrianglePair(TrianglesOnBoundaryCount, BTS));
   TrianglesOnBoundaryCount++;
+
+  // set as last new triangle
+  LastTriangle = BTS;
+
+  // NOTE: add triangle to local maps is done in constructor of BoundaryTriangleSet
+};
+
+/** Function adds triangle to global list.
+ * Furthermore, the triangle number is set to \a nr.
+ * \param nr triangle number
+ */
+void Tesselation::AddTesselationTriangle(int nr)
+{
+  cout << Verbose(1) << "Adding triangle to global TrianglesOnBoundary map." << endl;
+
+  // add triangle to global map
+  TrianglesOnBoundary.insert(TrianglePair(nr, BTS));
 
   // set as last new triangle
@@ -2097 +2134 @@
     BTS = new class BoundaryTriangleSet(BLS, OldTriangleNrs[0]);
     BTS->GetNormalVector(BaseLineNormal);
-    TrianglesOnBoundary.insert(TrianglePair(OldTriangleNrs[0], BTS));
+    AddTesselationTriangle(OldTriangleNrs[0]);
     *out << Verbose(3) << "INFO: Created new triangle " << *BTS << "." << endl;
 
@@ -2105 +2142 @@
     BTS = new class BoundaryTriangleSet(BLS, OldTriangleNrs[1]);
     BTS->GetNormalVector(BaseLineNormal);
-    TrianglesOnBoundary.insert(TrianglePair(OldTriangleNrs[1], BTS));
+    AddTesselationTriangle(OldTriangleNrs[1]);
     *out << Verbose(3) << "INFO: Created new triangle " << *BTS << "." << endl;
   } else {
@@ -2481 +2518 @@
   }
   if (trianglePoints[0]->node->DistanceSquared(x) < MYEPSILON) {
-    *out << Verbose(2) << "Point is right on a tesselation point, no nearest triangle." << endl;
+    *out << Verbose(3) << "Point is right on a tesselation point, no nearest triangle." << endl;
     PointMap::iterator PointRunner = PointsOnBoundary.find(trianglePoints[0]->nr);
     triangles = new list<BoundaryTriangleSet*>;
@@ -2512 +2549 @@
         *out << Verbose(1) << "ERROR: IsInnerPoint encounters serious error, point " << i << " not found." << endl;
       }
-      *out << Verbose(1) << "List of triangle points:" << endl;
-      *out << Verbose(2) << *trianglePoints[i] << endl;
+      //*out << Verbose(2) << "List of triangle points:" << endl;
+      //*out << Verbose(3) << *trianglePoints[i] << endl;
     }
 
     triangles = FindTriangles(trianglePoints);
-    *out << Verbose(1) << "List of possible triangles:" << endl;
+    *out << Verbose(2) << "List of possible triangles:" << endl;
     for(list<BoundaryTriangleSet*>::iterator Runner = triangles->begin(); Runner != triangles->end(); Runner++)
-      *out << Verbose(2) << **Runner << endl;
+      *out << Verbose(3) << **Runner << endl;
 
     delete(connectedClosestPoints);
@@ -3299 +3336 @@
   int count  = 0;
 
+  cout << Verbose(1) << "Begin of RemoveDegeneratedTriangles" << endl;
+
   for (map<int, int>::iterator TriangleKeyRunner = DegeneratedTriangles->begin();
     TriangleKeyRunner != DegeneratedTriangles->end(); ++TriangleKeyRunner
@@ -3370 +3409 @@
 
   cout << Verbose(1) << "RemoveDegeneratedTriangles() removed " << count << " triangles:" << endl;
+  cout << Verbose(1) << "End of RemoveDegeneratedTriangles" << endl;
 }