Changeset f07455 for molecuilder

Timestamp:

Apr 22, 2010, 3:47:22 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

af20f3

Parents:

424d3fe

Message:

FIX: Tesselation::FindStartingTriangle() returns false when no triangle could have been created.

• this may act in the future as the beginning to some mean of increasing radii or another way to find a starting triangle.

Location:

molecuilder/src

Files:

• boundary.cpp (modified) (1 diff)
• tesselation.cpp (modified) (2 diffs)
• tesselation.hpp (modified) (1 diff)

molecuilder/src/boundary.cpp

@@ -980 +980 @@
 
   // 1. get starting triangle
-  TesselStruct->FindStartingTriangle(RADIUS, LCList);
+  if (!TesselStruct->FindStartingTriangle(RADIUS, LCList)) {
+    DoeLog(0) && (eLog() << Verbose(0) << "No valid starting triangle found." << endl);
+    performCriticalExit();
+  }
   if (filename != NULL) {
     if ((DoSingleStepOutput && ((TesselStruct->TrianglesOnBoundary.size() % SingleStepWidth == 0)))) { // if we have a new triangle and want to output each new triangle configuration

molecuilder/src/tesselation.cpp

@@ -2181 +2181 @@
  * \param RADIUS radius of virtual rolling sphere
  * \param *LC LinkedCell structure with neighbouring TesselPoint's
- */
-void Tesselation::FindStartingTriangle(const double RADIUS, const LinkedCell *LC)
+ * \return true - a starting triangle has been created, false - no valid triple of points found
+ */
+bool Tesselation::FindStartingTriangle(const double RADIUS, const LinkedCell *LC)
 {
   Info FunctionInfo(__func__);
@@ -2303 +2304 @@
     delete BaseLine;
   }
+
+  return (BTS != NULL);
 }
 ;

molecuilder/src/tesselation.hpp

@@ -296 +296 @@
 
     // concave envelope
-    void FindStartingTriangle(const double RADIUS, const LinkedCell *LC);
+    bool FindStartingTriangle(const double RADIUS, const LinkedCell *LC);
     void FindSecondPointForTesselation(class TesselPoint* a, Vector Oben, class TesselPoint*& OptCandidate, double Storage[3], double RADIUS, const LinkedCell *LC);
     void FindThirdPointForTesselation(const Vector &NormalVector, const Vector &SearchDirection, const Vector &OldSphereCenter, CandidateForTesselation &CandidateLine, const class BoundaryPointSet  * const ThirdNode, const double RADIUS, const LinkedCell *LC) const;