Changes in molecuilder/src/tesselation.cpp [d6b011:78dac6]

File:

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

molecuilder/src/tesselation.cpp

@@ -16 +16 @@
   LinesCount = 0;
   Nr = -1;
+  value = 0.;
 };
 
@@ -26 +27 @@
   LinesCount = 0;
   Nr = Walker->nr;
+  value = 0.;
 };
 
@@ -148 +150 @@
 void BoundaryLineSet::AddTriangle(class BoundaryTriangleSet *triangle)
 {
-  cout << Verbose(6) << "Add " << triangle->Nr << " to line " << *this << "."
-      << endl;
+  cout << Verbose(6) << "Add " << triangle->Nr << " to line " << *this << "." << endl;
   triangles.insert(TrianglePair(triangle->Nr, triangle));
 };
@@ -177 +178 @@
   if (triangles.size() != 2) {
     *out << Verbose(1) << "ERROR: Baseline " << *this << " is connect to less than two triangles, Tesselation incomplete!" << endl;
-    return false;
+    return true;
   }
   // check normal vectors
   // have a normal vector on the base line pointing outwards
-  *out << Verbose(3) << "INFO: " << *this << " has vectors at " << *(endpoints[0]->node->node) << " and at " << *(endpoints[1]->node->node) << "." << endl;
+  //*out << Verbose(3) << "INFO: " << *this << " has vectors at " << *(endpoints[0]->node->node) << " and at " << *(endpoints[1]->node->node) << "." << endl;
   BaseLineCenter.CopyVector(endpoints[0]->node->node);
   BaseLineCenter.AddVector(endpoints[1]->node->node);
@@ -187 +188 @@
   BaseLine.CopyVector(endpoints[0]->node->node);
   BaseLine.SubtractVector(endpoints[1]->node->node);
-  *out << Verbose(3) << "INFO: Baseline is " << BaseLine << " and its center is at " << BaseLineCenter << "." << endl;
+  //*out << Verbose(3) << "INFO: Baseline is " << BaseLine << " and its center is at " << BaseLineCenter << "." << endl;
 
   BaseLineNormal.Zero();
@@ -195 +196 @@
   class BoundaryPointSet *node = NULL;
   for(TriangleMap::iterator runner = triangles.begin(); runner != triangles.end(); runner++) {
-    *out << Verbose(3) << "INFO: NormalVector of " << *(runner->second) << " is " << runner->second->NormalVector << "." << endl;
+    //*out << Verbose(3) << "INFO: NormalVector of " << *(runner->second) << " is " << runner->second->NormalVector << "." << endl;
     NormalCheck.AddVector(&runner->second->NormalVector);
     NormalCheck.Scale(sign);
@@ -202 +203 @@
     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 {
-      *out << Verbose(2) << "WARNING: I cannot find third node in triangle, something's wrong." << endl;
+      //*out << Verbose(2) << "WARNING: I cannot find third node in triangle, something's wrong." << endl;
       return true;
     }
   }
-  *out << Verbose(3) << "INFO: BaselineNormal is " << BaseLineNormal << "." << endl;
+  //*out << Verbose(3) << "INFO: BaselineNormal is " << BaseLineNormal << "." << endl;
   if (NormalCheck.NormSquared() < MYEPSILON) {
-    *out << Verbose(3) << "Normalvectors of both triangles are the same: convex." << endl;
+    *out << Verbose(2) << "ACCEPT: Normalvectors of both triangles are the same: convex." << endl;
     return true;
   }
-  double angle = GetAngle(helper[0], helper[1], BaseLineNormal);
-  if ((angle - M_PI) > -MYEPSILON)
+  double angle = getAngle(helper[0], helper[1], BaseLineNormal);
+  if ((angle - M_PI) > -MYEPSILON) {
+    *out << Verbose(2) << "ACCEPT: Angle is greater than pi: convex." << endl;
     return true;
-  else
+  } else {
+    *out << Verbose(2) << "REJECT: Angle is less than pi: concave." << endl;
     return false;
+  }
 }
 
@@ -349 +353 @@
 
   // make it always point inward (any offset vector onto plane projected onto normal vector suffices)
-  if (NormalVector.Projection(&OtherVector) > 0)
+  if (NormalVector.ScalarProduct(&OtherVector) > 0.)
     NormalVector.Scale(-1.);
 };
@@ -737 +741 @@
           TrialVector.CopyVector(checker->second->node->node);
           TrialVector.SubtractVector(A->second->node->node);
-          distance = TrialVector.Projection(&PlaneVector);
+          distance = TrialVector.ScalarProduct(&PlaneVector);
           if (fabs(distance) < 1e-4) // we need to have a small epsilon around 0 which is still ok
             continue;
@@ -897 +901 @@
         TempVector.SubtractVector(baseline->second->endpoints[0]->node->node); // TempVector is vector on triangle plane pointing from one baseline egde towards center!
         //*out << Verbose(2) << "Projection of propagation onto temp: " << PropagationVector.Projection(&TempVector) << "." << endl;
-        if (PropagationVector.Projection(&TempVector) > 0) // make sure normal propagation vector points outward from baseline
+        if (PropagationVector.ScalarProduct(&TempVector) > 0) // make sure normal propagation vector points outward from baseline
           PropagationVector.Scale(-1.);
         *out << Verbose(4) << "PropagationVector of base triangle is " << PropagationVector << endl;
@@ -957 +961 @@
             TempVector.SubtractVector(Center);
             // make it always point outward
-            if (VirtualNormalVector.Projection(&TempVector) < 0)
+            if (VirtualNormalVector.ScalarProduct(&TempVector) < 0)
               VirtualNormalVector.Scale(-1.);
             // calculate angle
@@ -1398 +1402 @@
 
 
-/** Finds the starting triangle for FindNonConvexBorder().
- * Looks at the outermost point per axis, then FindSecondPointForTesselation()
- * for the second and FindNextSuitablePointViaAngleOfSphere() for the third
+/** Finds the starting triangle for find_non_convex_border().
+ * Looks at the outermost point per axis, then Find_second_point_for_Tesselation()
+ * for the second and Find_next_suitable_point_via_Angle_of_Sphere() for the third
  * point are called.
  * \param *out output stream for debugging
@@ -1406 +1410 @@
  * \param *LC LinkedCell structure with neighbouring TesselPoint's
  */
-void Tesselation::FindStartingTriangle(ofstream *out, const double RADIUS, LinkedCell *LC)
-{
-  cout << Verbose(1) << "Begin of FindStartingTriangle\n";
+void Tesselation::Find_starting_triangle(ofstream *out, const double RADIUS, LinkedCell *LC)
+{
+  cout << Verbose(1) << "Begin of Find_starting_triangle\n";
   int i = 0;
   LinkedNodes *List = NULL;
@@ -1414 +1418 @@
   TesselPoint* SecondPoint = NULL;
   TesselPoint* MaxPoint[NDIM];
-  double maxCoordinate[NDIM];
+  double max_coordinate[NDIM];
   Vector Oben;
   Vector helper;
@@ -1424 +1428 @@
   for (i = 0; i < 3; i++) {
     MaxPoint[i] = NULL;
-    maxCoordinate[i] = -1;
+    max_coordinate[i] = -1;
   }
 
@@ -1436 +1440 @@
         if (List != NULL) {
           for (LinkedNodes::iterator Runner = List->begin();Runner != List->end();Runner++) {
-            if ((*Runner)->node->x[i] > maxCoordinate[i]) {
+            if ((*Runner)->node->x[i] > max_coordinate[i]) {
               cout << Verbose(2) << "New maximal for axis " << i << " node is " << *(*Runner) << " at " << *(*Runner)->node << "." << endl;
-              maxCoordinate[i] = (*Runner)->node->x[i];
+              max_coordinate[i] = (*Runner)->node->x[i];
               MaxPoint[i] = (*Runner);
             }
@@ -1454 +1458 @@
 
   BTS = NULL;
-  CandidateList *OptCandidates = new CandidateList();
+  CandidateList *Opt_Candidates = new CandidateList();
   for (int k=0;k<NDIM;k++) {
     Oben.x[k] = 1.;
@@ -1461 +1465 @@
 
     double ShortestAngle;
-    TesselPoint* OptCandidate = NULL;
+    TesselPoint* Opt_Candidate = NULL;
     ShortestAngle = 999999.; // This will contain the angle, which will be always positive (when looking for second point), when looking for third point this will be the quadrant.
 
-    FindSecondPointForTesselation(FirstPoint, NULL, Oben, OptCandidate, &ShortestAngle, RADIUS, LC); // we give same point as next candidate as its bonds are looked into in find_second_...
-    SecondPoint = OptCandidate;
+    Find_second_point_for_Tesselation(FirstPoint, NULL, Oben, Opt_Candidate, &ShortestAngle, RADIUS, LC); // we give same point as next candidate as its bonds are looked into in find_second_...
+    SecondPoint = Opt_Candidate;
     if (SecondPoint == NULL)  // have we found a second point?
       continue;
@@ -1496 +1500 @@
 
     //cout << Verbose(2) << "INFO: OldSphereCenter is at " << helper << ".\n";
-    FindThirdPointForTesselation(
-      Oben, SearchDirection, helper, BLS[0], NULL, *&OptCandidates, &ShortestAngle, RADIUS, LC
+    Find_third_point_for_Tesselation(
+      Oben, SearchDirection, helper, BLS[0], NULL, *&Opt_Candidates, &ShortestAngle, RADIUS, LC
     );
     cout << Verbose(1) << "List of third Points is ";
-    for (CandidateList::iterator it = OptCandidates->begin(); it != OptCandidates->end(); ++it) {
+    for (CandidateList::iterator it = Opt_Candidates->begin(); it != Opt_Candidates->end(); ++it) {
         cout << " " << *(*it)->point;
     }
     cout << endl;
 
-    for (CandidateList::iterator it = OptCandidates->begin(); it != OptCandidates->end(); ++it) {
+    for (CandidateList::iterator it = Opt_Candidates->begin(); it != Opt_Candidates->end(); ++it) {
       // add third triangle point
       AddTesselationPoint((*it)->point, 2);
@@ -1522 +1526 @@
 
       // if we do not reach the end with the next step of iteration, we need to setup a new first line
-      if (it != OptCandidates->end()--) {
+      if (it != Opt_Candidates->end()--) {
         FirstPoint = (*it)->BaseLine->endpoints[0]->node;
         SecondPoint = (*it)->point;
@@ -1530 +1534 @@
         AddTesselationLine(TPS[0], TPS[1], 0);
       }
-      cout << Verbose(2) << "Projection is " << BTS->NormalVector.Projection(&Oben) << "." << endl;
+      cout << Verbose(2) << "Projection is " << BTS->NormalVector.ScalarProduct(&Oben) << "." << endl;
     }
     if (BTS != NULL) // we have created one starting triangle
@@ -1537 +1541 @@
       // remove all candidates from the list and then the list itself
       class CandidateForTesselation *remover = NULL;
-      for (CandidateList::iterator it = OptCandidates->begin(); it != OptCandidates->end(); ++it) {
+      for (CandidateList::iterator it = Opt_Candidates->begin(); it != Opt_Candidates->end(); ++it) {
         remover = *it;
         delete(remover);
       }
-      OptCandidates->clear();
+      Opt_Candidates->clear();
     }
   }
@@ -1547 +1551 @@
   // remove all candidates from the list and then the list itself
   class CandidateForTesselation *remover = NULL;
-  for (CandidateList::iterator it = OptCandidates->begin(); it != OptCandidates->end(); ++it) {
+  for (CandidateList::iterator it = Opt_Candidates->begin(); it != Opt_Candidates->end(); ++it) {
     remover = *it;
     delete(remover);
   }
-  delete(OptCandidates);
-  cout << Verbose(1) << "End of FindStartingTriangle\n";
+  delete(Opt_Candidates);
+  cout << Verbose(1) << "End of Find_starting_triangle\n";
 };
 
@@ -1564 +1568 @@
  * @param *LC LinkedCell structure with neighbouring points
  */
-bool Tesselation::FindNextSuitableTriangle(ofstream *out, BoundaryLineSet &Line, BoundaryTriangleSet &T, const double& RADIUS, int N, LinkedCell *LC)
-{
-  cout << Verbose(0) << "Begin of FindNextSuitableTriangle\n";
+bool Tesselation::Find_next_suitable_triangle(ofstream *out, BoundaryLineSet &Line, BoundaryTriangleSet &T, const double& RADIUS, int N, LinkedCell *LC)
+{
+  cout << Verbose(0) << "Begin of Find_next_suitable_triangle\n";
   bool result = true;
-  CandidateList *OptCandidates = new CandidateList();
+  CandidateList *Opt_Candidates = new CandidateList();
 
   Vector CircleCenter;
@@ -1625 +1629 @@
 
     // add third point
-    FindThirdPointForTesselation(
-      T.NormalVector, SearchDirection, OldSphereCenter, &Line, ThirdNode, OptCandidates,
+    Find_third_point_for_Tesselation(
+      T.NormalVector, SearchDirection, OldSphereCenter, &Line, ThirdNode, Opt_Candidates,
       &ShortestAngle, RADIUS, LC
     );
@@ -1634 +1638 @@
   }
 
-  if (OptCandidates->begin() == OptCandidates->end()) {
+  if (Opt_Candidates->begin() == Opt_Candidates->end()) {
     cerr << "WARNING: Could not find a suitable candidate." << endl;
     return false;
   }
   cout << Verbose(1) << "Third Points are ";
-  for (CandidateList::iterator it = OptCandidates->begin(); it != OptCandidates->end(); ++it) {
+  for (CandidateList::iterator it = Opt_Candidates->begin(); it != Opt_Candidates->end(); ++it) {
     cout << " " << *(*it)->point;
   }
@@ -1645 +1649 @@
 
   BoundaryLineSet *BaseRay = &Line;
-  for (CandidateList::iterator it = OptCandidates->begin(); it != OptCandidates->end(); ++it) {
+  for (CandidateList::iterator it = Opt_Candidates->begin(); it != Opt_Candidates->end(); ++it) {
     cout << Verbose(1) << " Third point candidate is " << *(*it)->point
     << " with circumsphere's center at " << (*it)->OptCenter << "." << endl;
@@ -1664 +1668 @@
       AddTesselationPoint(BaseRay->endpoints[1]->node, 2);
 
-      if (CheckLineCriteriaForDegeneratedTriangle(TPS)) {
+      if (CheckLineCriteriaforDegeneratedTriangle(TPS)) {
         AddTesselationLine(TPS[0], TPS[1], 0);
         AddTesselationLine(TPS[0], TPS[2], 1);
@@ -1693 +1697 @@
         // We demand that at most one new degenerate line is created and that this line also already exists (which has to be the case due to existentTrianglesCount == 1)
         // i.e. at least one of the three lines must be present with TriangleCount <= 1
-        if (CheckLineCriteriaForDegeneratedTriangle(TPS)) {
+        if (CheckLineCriteriaforDegeneratedTriangle(TPS)) {
           AddTesselationLine(TPS[0], TPS[1], 0);
           AddTesselationLine(TPS[0], TPS[2], 1);
@@ -1731 +1735 @@
   // remove all candidates from the list and then the list itself
   class CandidateForTesselation *remover = NULL;
-  for (CandidateList::iterator it = OptCandidates->begin(); it != OptCandidates->end(); ++it) {
+  for (CandidateList::iterator it = Opt_Candidates->begin(); it != Opt_Candidates->end(); ++it) {
     remover = *it;
     delete(remover);
   }
-  delete(OptCandidates);
-  cout << Verbose(0) << "End of FindNextSuitableTriangle\n";
+  delete(Opt_Candidates);
+  cout << Verbose(0) << "End of Find_next_suitable_triangle\n";
   return result;
 };
@@ -1751 +1755 @@
   class BoundaryPointSet *Spot = NULL;
   class BoundaryLineSet *OtherBase;
-  Vector *ClosestPoint[2];
+  Vector *ClosestPoint;
 
   int m=0;
@@ -1764 +1768 @@
 
   // get the closest point on each line to the other line
-  ClosestPoint[0] = GetClosestPointBetweenLine(out, Base, OtherBase);
-  ClosestPoint[1] = GetClosestPointBetweenLine(out, OtherBase, Base);
+  ClosestPoint = GetClosestPointBetweenLine(out, Base, OtherBase);
 
   // delete the temporary other base line
@@ -1771 +1774 @@
 
   // get the distance vector from Base line to OtherBase line
-  Vector DistanceToIntersection, BaseLine;
+  Vector DistanceToIntersection[2], BaseLine;
+  double distance[2];
   BaseLine.CopyVector(Base->endpoints[1]->node->node);
   BaseLine.SubtractVector(Base->endpoints[0]->node->node);
-  DistanceToIntersection.CopyVector(ClosestPoint[0]);
-  DistanceToIntersection.SubtractVector(Base->endpoints[0]->node->node);
-  Spot = Base->endpoints[1];
-  if (BaseLine.ScalarProduct(&DistanceToIntersection) < -MYEPSILON) {
-    DistanceToIntersection.CopyVector(ClosestPoint[0]);
-    DistanceToIntersection.SubtractVector(Base->endpoints[1]->node->node);
-    Spot = Base->endpoints[0];
-    if (BaseLine.ScalarProduct(&DistanceToIntersection) < -MYEPSILON) {
-      *out << Verbose(3) << "ERROR: Something's very wrong here, both SKPs return negative?!" << endl;
-      return NULL;
-    }
-  }
-  if ((BaseLine.NormSquared() - DistanceToIntersection.NormSquared()) < -MYEPSILON) {  // distance is smaller: concave
-    *out << Verbose(3) << "INFO: Rectangle of triangles of base line " << *Base << " is concave: Base line squared length " << BaseLine.NormSquared() << " against Distance to intersection squared " << DistanceToIntersection.NormSquared() << "." << endl;
+  for (int i=0;i<2;i++) {
+    DistanceToIntersection[i].CopyVector(ClosestPoint);
+    DistanceToIntersection[i].SubtractVector(Base->endpoints[i]->node->node);
+    distance[i] = BaseLine.ScalarProduct(&DistanceToIntersection[i]);
+  }
+  delete(ClosestPoint);
+  if ((distance[0] * distance[1]) > 0)  { // have same sign?
+    *out << Verbose(3) << "REJECT: Both SKPs have same sign: " << distance[0] << " and " << distance[1]  << ". " << *Base << "' rectangle is concave." << endl;
+    if (distance[0] < distance[1]) {
+      Spot = Base->endpoints[0];
+    } else {
+      Spot = Base->endpoints[1];
+    }
     return Spot;
-  } else {  // base line is longer: convex
-    *out << Verbose(3) << "INFO: Rectangle of triangles of base line " << *Base << " is concave." << endl;
+  } else {  // different sign, i.e. we are in between
+    *out << Verbose(3) << "ACCEPT: Rectangle of triangles of base line " << *Base << " is convex." << endl;
     return NULL;
   }
@@ -1796 +1799 @@
 };
 
+void Tesselation::PrintAllBoundaryPoints(ofstream *out)
+{
+  // print all lines
+  *out << Verbose(1) << "Printing all boundary points for debugging:" << endl;
+  for (PointMap::iterator PointRunner = PointsOnBoundary.begin();PointRunner != PointsOnBoundary.end(); PointRunner++)
+    *out << Verbose(2) << *(PointRunner->second) << endl;
+};
+
+void Tesselation::PrintAllBoundaryLines(ofstream *out)
+{
+  // print all lines
+  *out << Verbose(1) << "Printing all boundary lines for debugging:" << endl;
+  for (LineMap::iterator LineRunner = LinesOnBoundary.begin(); LineRunner != LinesOnBoundary.end(); LineRunner++)
+    *out << Verbose(2) << *(LineRunner->second) << endl;
+};
+
+void Tesselation::PrintAllBoundaryTriangles(ofstream *out)
+{
+  // print all triangles
+  *out << Verbose(1) << "Printing all boundary triangles for debugging:" << endl;
+  for (TriangleMap::iterator TriangleRunner = TrianglesOnBoundary.begin(); TriangleRunner != TrianglesOnBoundary.end(); TriangleRunner++)
+    *out << Verbose(2) << *(TriangleRunner->second) << endl;
+};
 
 /** For a given boundary line \a *Base and its two triangles, picks the central baseline that is "higher".
@@ -1826 +1852 @@
   Distance.SubtractVector(ClosestPoint[0]);
 
-  // delete the temporary other base line
+  // delete the temporary other base line and the closest points
+  delete(ClosestPoint[0]);
+  delete(ClosestPoint[1]);
   delete(OtherBase);
 
@@ -1843 +1871 @@
       BaseLineNormal.AddVector(&(runner->second->NormalVector));
     }
-    BaseLineNormal.Scale(-1./2.); // has to point inside for BoundaryTriangleSet::GetNormalVector()
+    BaseLineNormal.Scale(1./2.);
 
     if (Distance.ScalarProduct(&BaseLineNormal) > MYEPSILON) { // Distance points outwards, hence OtherBase higher than Base -> flip
@@ -1866 +1894 @@
   // construct the plane of the two baselines (i.e. take both their directional vectors)
   Vector Normal;
-  Vector OtherBaseline;
-  Normal.CopyVector(Base->endpoints[1]->node->node);
-  Normal.SubtractVector(Base->endpoints[0]->node->node);
+  Vector Baseline, OtherBaseline;
+  Baseline.CopyVector(Base->endpoints[1]->node->node);
+  Baseline.SubtractVector(Base->endpoints[0]->node->node);
   OtherBaseline.CopyVector(OtherBase->endpoints[1]->node->node);
   OtherBaseline.SubtractVector(OtherBase->endpoints[0]->node->node);
+  Normal.CopyVector(&Baseline);
   Normal.VectorProduct(&OtherBaseline);
   Normal.Normalize();
-
-  // project one offset point of OtherBase onto this plane
+  *out << Verbose(4) << "First direction is " << Baseline << ", second direction is " << OtherBaseline << ", normal of intersection plane is " << Normal << "." << endl;
+
+  // project one offset point of OtherBase onto this plane (and add plane offset vector)
   Vector NewOffset;
   NewOffset.CopyVector(OtherBase->endpoints[0]->node->node);
+  NewOffset.SubtractVector(Base->endpoints[0]->node->node);
   NewOffset.ProjectOntoPlane(&Normal);
+  NewOffset.AddVector(Base->endpoints[0]->node->node);
   Vector NewDirection;
-  NewDirection.CopyVector(OtherBase->endpoints[1]->node->node);
-  NewDirection.ProjectOntoPlane(&Normal);
+  NewDirection.CopyVector(&NewOffset);
+  NewDirection.AddVector(&OtherBaseline);
 
   // calculate the intersection between this projected baseline and Base
   Vector *Intersection = new Vector;
   Intersection->GetIntersectionOfTwoLinesOnPlane(out, Base->endpoints[0]->node->node, Base->endpoints[1]->node->node, &NewOffset, &NewDirection, &Normal);
+  Normal.CopyVector(Intersection);
+  Normal.SubtractVector(Base->endpoints[0]->node->node);
+  *out << Verbose(3) << "Found closest point on " << *Base << " at " << *Intersection << ", factor in line is " << fabs(Normal.ScalarProduct(&Baseline)/Baseline.NormSquared()) << "." << endl;
 
   return Intersection;
@@ -2012 +2047 @@
  * \param *Candidate pointer to candidate node on return
  * \param Oben vector indicating the outside
- * \param OptCandidate reference to recommended candidate on return
+ * \param Opt_Candidate reference to recommended candidate on return
  * \param Storage[3] array storing angles and other candidate information
  * \param RADIUS radius of virtual sphere
  * \param *LC LinkedCell structure with neighbouring points
  */
-void Tesselation::FindSecondPointForTesselation(TesselPoint* a, TesselPoint* Candidate, Vector Oben, TesselPoint*& OptCandidate, double Storage[3], double RADIUS, LinkedCell *LC)
-{
-  cout << Verbose(2) << "Begin of FindSecondPointForTesselation" << endl;
+void Tesselation::Find_second_point_for_Tesselation(TesselPoint* a, TesselPoint* Candidate, Vector Oben, TesselPoint*& Opt_Candidate, double Storage[3], double RADIUS, LinkedCell *LC)
+{
+  cout << Verbose(2) << "Begin of Find_second_point_for_Tesselation" << endl;
   Vector AngleCheck;
   double norm = -1., angle;
@@ -2057 +2092 @@
             if (a != Candidate) {
               // Calculate center of the circle with radius RADIUS through points a and Candidate
-              Vector OrthogonalizedOben, aCandidate, Center;
+              Vector OrthogonalizedOben, a_Candidate, Center;
               double distance, scaleFactor;
 
               OrthogonalizedOben.CopyVector(&Oben);
-              aCandidate.CopyVector(a->node);
-              aCandidate.SubtractVector(Candidate->node);
-              OrthogonalizedOben.ProjectOntoPlane(&aCandidate);
+              a_Candidate.CopyVector(a->node);
+              a_Candidate.SubtractVector(Candidate->node);
+              OrthogonalizedOben.ProjectOntoPlane(&a_Candidate);
               OrthogonalizedOben.Normalize();
-              distance = 0.5 * aCandidate.Norm();
+              distance = 0.5 * a_Candidate.Norm();
               scaleFactor = sqrt(((RADIUS * RADIUS) - (distance * distance)));
               OrthogonalizedOben.Scale(scaleFactor);
@@ -2076 +2111 @@
               AngleCheck.CopyVector(&Center);
               AngleCheck.SubtractVector(a->node);
-              norm = aCandidate.Norm();
+              norm = a_Candidate.Norm();
               // second point shall have smallest angle with respect to Oben vector
               if (norm < RADIUS*2.) {
@@ -2083 +2118 @@
                   //cout << Verbose(3) << "Old values of Storage: %lf %lf \n", Storage[0], Storage[1]);
                   cout << Verbose(3) << "Current candidate is " << *Candidate << ": Is a better candidate with distance " << norm << " and angle " << angle << " to oben " << Oben << ".\n";
-                  OptCandidate = Candidate;
+                  Opt_Candidate = Candidate;
                   Storage[0] = angle;
                   //cout << Verbose(3) << "Changing something in Storage: %lf %lf. \n", Storage[0], Storage[2]);
                 } else {
-                  //cout << Verbose(3) << "Current candidate is " << *Candidate << ": Looses with angle " << angle << " to a better candidate " << *OptCandidate << endl;
+                  //cout << Verbose(3) << "Current candidate is " << *Candidate << ": Looses with angle " << angle << " to a better candidate " << *Opt_Candidate << endl;
                 }
               } else {
@@ -2100 +2135 @@
         }
       }
-  cout << Verbose(2) << "End of FindSecondPointForTesselation" << endl;
+  cout << Verbose(2) << "End of Find_second_point_for_Tesselation" << endl;
 };
 
@@ -2126 +2161 @@
  * holds. Then, the normalized projection onto the SearchDirection is either +1 or -1 and thus states whether
  * the angle is uniquely in either (0,M_PI] or [M_PI, 2.*M_PI).
- * @param NormalVector normal direction of the base triangle (here the unit axis vector, \sa FindStartingTriangle())
+ * @param NormalVector normal direction of the base triangle (here the unit axis vector, \sa Find_starting_triangle())
  * @param SearchDirection general direction where to search for the next point, relative to center of BaseLine
  * @param OldSphereCenter center of sphere for base triangle, relative to center of BaseLine, giving null angle for the parameter circle
@@ -2132 +2167 @@
  * @param ThirdNode third point to avoid in search
  * @param candidates list of equally good candidates to return
- * @param ShortestAngle the current path length on this circle band for the current OptCandidate
+ * @param ShortestAngle the current path length on this circle band for the current Opt_Candidate
  * @param RADIUS radius of sphere
  * @param *LC LinkedCell structure with neighbouring points
  */
-void Tesselation::FindThirdPointForTesselation(Vector NormalVector, Vector SearchDirection, Vector OldSphereCenter, class BoundaryLineSet *BaseLine, class TesselPoint  *ThirdNode, CandidateList* &candidates, double *ShortestAngle, const double RADIUS, LinkedCell *LC)
+void Tesselation::Find_third_point_for_Tesselation(Vector NormalVector, Vector SearchDirection, Vector OldSphereCenter, class BoundaryLineSet *BaseLine, class TesselPoint  *ThirdNode, CandidateList* &candidates, double *ShortestAngle, const double RADIUS, LinkedCell *LC)
 {
   Vector CircleCenter;  // center of the circle, i.e. of the band of sphere's centers
@@ -2153 +2188 @@
   CandidateForTesselation *optCandidate = NULL;
 
-  cout << Verbose(1) << "Begin of FindThirdPointForTesselation" << endl;
+  cout << Verbose(1) << "Begin of Find_third_point_for_Tesselation" << endl;
 
   //cout << Verbose(2) << "INFO: NormalVector of BaseTriangle is " << NormalVector << "." << endl;
@@ -2310 +2345 @@
   if (candidates->size() > 1) {
     candidates->unique();
-    candidates->sort(SortCandidates);
-  }
-
-  cout << Verbose(1) << "End of FindThirdPointForTesselation" << endl;
+    candidates->sort(sortCandidates);
+  }
+
+  cout << Verbose(1) << "End of Find_third_point_for_Tesselation" << endl;
 };
 
@@ -2362 +2397 @@
   }
 
-  trianglePoints[0] = FindClosestPoint(x, SecondPoint, LC);
+  trianglePoints[0] = findClosestPoint(x, SecondPoint, LC);
   
   // check whether closest point is "too close" :), then it's inside
@@ -2373 +2408 @@
     return NULL;
   }
-  list<TesselPoint*> *connectedPoints = GetCircleOfConnectedPoints(out, trianglePoints[0]);
-  list<TesselPoint*> *connectedClosestPoints = GetNeighboursOnCircleOfConnectedPoints(out, connectedPoints, trianglePoints[0], x);
+  list<TesselPoint*> *connectedPoints = getCircleOfConnectedPoints(out, trianglePoints[0]);
+  list<TesselPoint*> *connectedClosestPoints = getNeighboursonCircleofConnectedPoints(out, connectedPoints, trianglePoints[0], x);
   delete(connectedPoints);
   trianglePoints[1] = connectedClosestPoints->front();
@@ -2462 +2497 @@
  * @return list of the all points linked to the provided one
  */
-list<TesselPoint*> * Tesselation::GetCircleOfConnectedPoints(ofstream *out, TesselPoint* Point)
+list<TesselPoint*> * Tesselation::getCircleOfConnectedPoints(ofstream *out, TesselPoint* Point)
 {
   list<TesselPoint*> *connectedPoints = new list<TesselPoint*>;
@@ -2523 +2558 @@
  * @return list of the two points linked to the provided one and closest to the point to be checked,
  */
-list<TesselPoint*> * Tesselation::GetNeighboursOnCircleOfConnectedPoints(ofstream *out, list<TesselPoint*> *connectedPoints, TesselPoint* Point, Vector* Reference)
+list<TesselPoint*> * Tesselation::getNeighboursonCircleofConnectedPoints(ofstream *out, list<TesselPoint*> *connectedPoints, TesselPoint* Point, Vector* Reference)
 {
   map<double, TesselPoint*> anglesOfPoints;
@@ -2562 +2597 @@
     helper.SubtractVector(Point->node);
     helper.ProjectOntoPlane(&PlaneNormal);
-    double angle = GetAngle(helper, AngleZero, OrthogonalVector);
+    double angle = getAngle(helper, AngleZero, OrthogonalVector);
     *out << Verbose(2) << "INFO: Calculated angle is " << angle << " for point " << **listRunner << "." << endl;
     anglesOfPoints.insert(pair<double, TesselPoint*>(angle, (*listRunner)));
@@ -2595 +2630 @@
   int i;
 
+  if (point == NULL) {
+    *out << Verbose(1) << "ERROR: Cannot remove the point " << point << ", it's NULL!" << endl;
+    return 0.;
+  } else
+    *out << Verbose(2) << "Removing point " << *point << " from tesselated boundary ..." << endl;
+
   // copy old location for the volume
   OldPoint.CopyVector(point->node->node);
@@ -2603 +2644 @@
     return 0.;
   }
-  list<TesselPoint*> *CircleofPoints = GetCircleOfConnectedPoints(out, point->node);
+  list<TesselPoint*> *CircleofPoints = getCircleOfConnectedPoints(out, point->node);
 
   // remove all triangles
@@ -2609 +2650 @@
     count+=LineRunner->second->triangles.size();
   numbers = new int[count];
+  class BoundaryTriangleSet **Candidates = new BoundaryTriangleSet*[count];
   i=0;
   for (LineMap::iterator LineRunner = point->lines.begin(); (point != NULL) && (LineRunner != point->lines.end()); LineRunner++) {
@@ -2614 +2656 @@
     for (TriangleMap::iterator TriangleRunner = line->triangles.begin(); TriangleRunner != line->triangles.end(); TriangleRunner++) {
       triangle = TriangleRunner->second;
-      *out << Verbose(2) << "Erasing triangle " << *triangle << "." << endl;
+      Candidates[i] = triangle;
       numbers[i++] = triangle->Nr;
-      RemoveTesselationTriangle(triangle);
-      triangle = NULL;
-    }
-  }
+    }
+  }
+  for (int j=0;j<i;j++) {
+    RemoveTesselationTriangle(Candidates[j]);
+  }
+  delete[](Candidates);
   *out << Verbose(1) << i << " triangles were removed." << endl;
 
@@ -2672 +2716 @@
  * \return true - there is such a line (i.e. creation of degenerated triangle is valid), false - no such line (don't create)
  */
-bool CheckLineCriteriaForDegeneratedTriangle(class BoundaryPointSet *nodes[3])
+bool CheckLineCriteriaforDegeneratedTriangle(class BoundaryPointSet *nodes[3])
 {
   bool result = false;
@@ -2706 +2750 @@
 /** Sort function for the candidate list.
  */
-bool SortCandidates(CandidateForTesselation* candidate1, CandidateForTesselation* candidate2)
+bool sortCandidates(CandidateForTesselation* candidate1, CandidateForTesselation* candidate2) 
 {
   Vector BaseLineVector, OrthogonalVector, helper;
@@ -2756 +2800 @@
  * @return point which is second closest to the provided one
  */
-TesselPoint* FindSecondClosestPoint(const Vector* Point, LinkedCell* LC)
+TesselPoint* findSecondClosestPoint(const Vector* Point, LinkedCell* LC)
 {
   LinkedNodes *List = NULL;
@@ -2802 +2846 @@
 };
 
+
+
 /**
  * Finds the point which is closest to the provided one.
@@ -2811 +2857 @@
  * @return point which is closest to the provided one, NULL if none found
  */
-TesselPoint* FindClosestPoint(const Vector* Point, TesselPoint *&SecondPoint, LinkedCell* LC)
+TesselPoint* findClosestPoint(const Vector* Point, TesselPoint *&SecondPoint, LinkedCell* LC)
 {
   LinkedNodes *List = NULL;
@@ -2858 +2904 @@
   return closestPoint;
 };
+
 
 /**
@@ -2924 +2971 @@
 }
 
-/**
- * Finds all degenerated triangles within the tesselation structure.
- *
- * @return map of keys of degenerated triangle pairs, each triangle occurs twice
- *         in the list, once as key and once as value
- */
-map<int, int> Tesselation::FindAllDegeneratedTriangles()
-{
-  map<int, int> DegeneratedTriangles;
-
-  // sanity check
-  if (LinesOnBoundary.empty()) {
-    cout << Verbose(1) << "Warning: FindAllDegeneratedTriangles() was called without any tesselation structure.";
-    return DegeneratedTriangles;
-  }
-
-  LineMap::iterator LineRunner1, LineRunner2;
-
-  for (LineRunner1 = LinesOnBoundary.begin(); LineRunner1 != LinesOnBoundary.end(); ++LineRunner1) {
-    for (LineRunner2 = LinesOnBoundary.begin(); LineRunner2 != LinesOnBoundary.end(); ++LineRunner2) {
-      if ((LineRunner1->second != LineRunner2->second)
-        && (LineRunner1->second->endpoints[0] == LineRunner2->second->endpoints[0])
-        && (LineRunner1->second->endpoints[1] == LineRunner2->second->endpoints[1])
-      ) {
-        TriangleMap::iterator TriangleRunner1 = LineRunner1->second->triangles.begin(),
-          TriangleRunner2 = LineRunner2->second->triangles.begin();
-
-        for (; TriangleRunner1 != LineRunner1->second->triangles.end(); ++TriangleRunner1) {
-          for (; TriangleRunner2 != LineRunner2->second->triangles.end(); ++TriangleRunner2) {
-            if ((TriangleRunner1->second != TriangleRunner2->second)
-              && (TriangleRunner1->second->endpoints[0] == TriangleRunner2->second->endpoints[0])
-              && (TriangleRunner1->second->endpoints[1] == TriangleRunner2->second->endpoints[1])
-              && (TriangleRunner1->second->endpoints[2] == TriangleRunner2->second->endpoints[2])
-            ) {
-              DegeneratedTriangles[TriangleRunner1->second->Nr] = TriangleRunner2->second->Nr;
-              DegeneratedTriangles[TriangleRunner2->second->Nr] = TriangleRunner1->second->Nr;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  cout << Verbose(1) << "FindAllDegeneratedTriangles() found " << DegeneratedTriangles.size() << " triangles." << endl;
-  map<int,int>::iterator it;
-  for (it = DegeneratedTriangles.begin(); it != DegeneratedTriangles.end(); it++)
-      cout << Verbose(2) << (*it).first << " => " << (*it).second << endl;
-
-  return DegeneratedTriangles;
-}
-
-/**
- * Purges degenerated triangles from the tesselation structure if they are not
- * necessary to keep a single point within the structure.
- */
-void Tesselation::RemoveDegeneratedTriangles()
-{
-  map<int, int> DegeneratedTriangles = FindAllDegeneratedTriangles();
-
-  for (map<int, int>::iterator TriangleKeyRunner = DegeneratedTriangles.begin();
-    TriangleKeyRunner != DegeneratedTriangles.end(); ++TriangleKeyRunner
-  ) {
-    BoundaryTriangleSet *triangle = TrianglesOnBoundary.find(TriangleKeyRunner->first)->second,
-      *partnerTriangle = TrianglesOnBoundary.find(TriangleKeyRunner->second)->second;
-
-    bool trianglesShareLine = false;
-    for (int i = 0; i < 3; ++i)
-      for (int j = 0; j < 3; ++j)
-        trianglesShareLine = trianglesShareLine || triangle->lines[i] == partnerTriangle->lines[j];
-
-    if (trianglesShareLine
-      && (triangle->endpoints[1]->LinesCount > 2)
-      && (triangle->endpoints[2]->LinesCount > 2)
-      && (triangle->endpoints[0]->LinesCount > 2)
-    ) {
-      cout << Verbose(1) << "RemoveDegeneratedTriangles() removes triangle " << *triangle << "." << endl;
-      RemoveTesselationTriangle(triangle);
-      cout << Verbose(1) << "RemoveDegeneratedTriangles() removes triangle " << *partnerTriangle << "." << endl;
-      RemoveTesselationTriangle(partnerTriangle);
-      DegeneratedTriangles.erase(DegeneratedTriangles.find(partnerTriangle->Nr));
-    } else {
-      cout << Verbose(1) << "RemoveDegeneratedTriangles() does not remove triangle " << *triangle
-        << " and its partner " << *partnerTriangle << " because it is essential for at"
-        << " least one of the endpoints to be kept in the tesselation structure." << endl;
-    }
-  }
-}
-
 /** Gets the angle between a point and a reference relative to the provided center.
  * We have two shanks point and reference between which the angle is calculated
@@ -3021 +2980 @@
  * @return angle between point and reference
  */
-double GetAngle(const Vector &point, const Vector &reference, const Vector OrthogonalVector)
-{
-  if (reference.IsNull())
+double getAngle(const Vector &point, const Vector &reference, const Vector OrthogonalVector)
+{
+  if (reference.IsZero())
     return M_PI;
 
   // calculate both angles and correct with in-plane vector
-  if (point.IsNull())
+  if (point.IsZero())
     return M_PI;
   double phi = point.Angle(&reference);