Changes in src/tesselationhelpers.cpp [299554:e138de]

File:

• src/tesselationhelpers.cpp (modified) (47 diffs)

src/tesselationhelpers.cpp

@@ -8 +8 @@
 #include <fstream>
 
-#include "info.hpp"
 #include "linkedcell.hpp"
 #include "log.hpp"
@@ -16 +15 @@
 #include "verbose.hpp"
 
-double DetGet(gsl_matrix * const A, const int inPlace)
-{
-        Info FunctionInfo(__func__);
+double DetGet(gsl_matrix * const A, const int inPlace) {
   /*
   inPlace = 1 => A is replaced with the LU decomposed copy.
@@ -48 +45 @@
 void GetSphere(Vector * const center, const Vector &a, const Vector &b, const Vector &c, const double RADIUS)
 {
-        Info FunctionInfo(__func__);
   gsl_matrix *A = gsl_matrix_calloc(3,3);
   double m11, m12, m13, m14;
@@ -81 +77 @@
 
   if (fabs(m11) < MYEPSILON)
-    DoeLog(1) && (eLog()<< Verbose(1) << "three points are colinear." << endl);
+    eLog() << Verbose(0) << "ERROR: three points are colinear." << endl;
 
   center->x[0] =  0.5 * m12/ m11;
@@ -88 +84 @@
 
   if (fabs(a.Distance(center) - RADIUS) > MYEPSILON)
-    DoeLog(1) && (eLog()<< Verbose(1) << "The given center is further way by " << fabs(a.Distance(center) - RADIUS) << " from a than RADIUS." << endl);
+    eLog() << Verbose(0) << "ERROR: The given center is further way by " << fabs(a.Distance(center) - RADIUS) << " from a than RADIUS." << endl;
 
   gsl_matrix_free(A);
@@ -115 +111 @@
     const double HalfplaneIndicator, const double AlternativeIndicator, const double alpha, const double beta, const double gamma, const double RADIUS, const double Umkreisradius)
 {
-        Info FunctionInfo(__func__);
   Vector TempNormal, helper;
   double Restradius;
   Vector OtherCenter;
+  Log() << Verbose(3) << "Begin of GetCenterOfSphere.\n";
   Center->Zero();
   helper.CopyVector(&a);
@@ -132 +128 @@
   Center->Scale(1./(sin(2.*alpha) + sin(2.*beta) + sin(2.*gamma)));
   NewUmkreismittelpunkt->CopyVector(Center);
-  DoLog(1) && (Log() << Verbose(1) << "Center of new circumference is " << *NewUmkreismittelpunkt << ".\n");
+  Log() << Verbose(4) << "Center of new circumference is " << *NewUmkreismittelpunkt << ".\n";
   // Here we calculated center of circumscribing circle, using barycentric coordinates
-  DoLog(1) && (Log() << Verbose(1) << "Center of circumference is " << *Center << " in direction " << *Direction << ".\n");
+  Log() << Verbose(4) << "Center of circumference is " << *Center << " in direction " << *Direction << ".\n";
 
   TempNormal.CopyVector(&a);
@@ -143 +139 @@
   if (fabs(HalfplaneIndicator) < MYEPSILON)
     {
-      if ((TempNormal.ScalarProduct(AlternativeDirection) <0 && AlternativeIndicator >0) || (TempNormal.ScalarProduct(AlternativeDirection) >0 && AlternativeIndicator <0))
+      if ((TempNormal.ScalarProduct(AlternativeDirection) <0 and AlternativeIndicator >0) or (TempNormal.ScalarProduct(AlternativeDirection) >0 and AlternativeIndicator <0))
         {
           TempNormal.Scale(-1);
@@ -150 +146 @@
   else
     {
-      if (((TempNormal.ScalarProduct(Direction)<0) && (HalfplaneIndicator >0)) || ((TempNormal.ScalarProduct(Direction)>0) && (HalfplaneIndicator<0)))
+      if (TempNormal.ScalarProduct(Direction)<0 && HalfplaneIndicator >0 || TempNormal.ScalarProduct(Direction)>0 && HalfplaneIndicator<0)
         {
           TempNormal.Scale(-1);
@@ -158 +154 @@
   TempNormal.Normalize();
   Restradius = sqrt(RADIUS*RADIUS - Umkreisradius*Umkreisradius);
-  DoLog(1) && (Log() << Verbose(1) << "Height of center of circumference to center of sphere is " << Restradius << ".\n");
+  Log() << Verbose(4) << "Height of center of circumference to center of sphere is " << Restradius << ".\n";
   TempNormal.Scale(Restradius);
-  DoLog(1) && (Log() << Verbose(1) << "Shift vector to sphere of circumference is " << TempNormal << ".\n");
+  Log() << Verbose(4) << "Shift vector to sphere of circumference is " << TempNormal << ".\n";
 
   Center->AddVector(&TempNormal);
-  DoLog(1) && (Log() << Verbose(1) << "Center of sphere of circumference is " << *Center << ".\n");
+  Log() << Verbose(0) << "Center of sphere of circumference is " << *Center << ".\n";
   GetSphere(&OtherCenter, a, b, c, RADIUS);
-  DoLog(1) && (Log() << Verbose(1) << "OtherCenter of sphere of circumference is " << OtherCenter << ".\n");
+  Log() << Verbose(0) << "OtherCenter of sphere of circumference is " << OtherCenter << ".\n";
+  Log() << Verbose(3) << "End of GetCenterOfSphere.\n";
 };
 
@@ -177 +174 @@
 void GetCenterofCircumcircle(Vector * const Center, const Vector &a, const Vector &b, const Vector &c)
 {
-        Info FunctionInfo(__func__);
   Vector helper;
   double alpha, beta, gamma;
@@ -190 +186 @@
   beta = M_PI - SideC.Angle(&SideA);
   gamma = M_PI - SideA.Angle(&SideB);
-  //Log() << Verbose(1) << "INFO: alpha = " << alpha/M_PI*180. << ", beta = " << beta/M_PI*180. << ", gamma = " << gamma/M_PI*180. << "." << endl;
-  if (fabs(M_PI - alpha - beta - gamma) > HULLEPSILON) {
-    DoeLog(2) && (eLog()<< Verbose(2) << "GetCenterofCircumcircle: Sum of angles " << (alpha+beta+gamma)/M_PI*180. << " > 180 degrees by " << fabs(M_PI - alpha - beta - gamma)/M_PI*180. << "!" << endl);
-  }
+  //Log() << Verbose(3) << "INFO: alpha = " << alpha/M_PI*180. << ", beta = " << beta/M_PI*180. << ", gamma = " << gamma/M_PI*180. << "." << endl;
+  if (fabs(M_PI - alpha - beta - gamma) > HULLEPSILON)
+    eLog() << Verbose(0) << "GetCenterofCircumcircle: Sum of angles " << (alpha+beta+gamma)/M_PI*180. << " > 180 degrees by " << fabs(M_PI - alpha - beta - gamma)/M_PI*180. << "!" << endl;
 
   Center->Zero();
@@ -223 +218 @@
 double GetPathLengthonCircumCircle(const Vector &CircleCenter, const Vector &CirclePlaneNormal, const double CircleRadius, const Vector &NewSphereCenter, const Vector &OldSphereCenter, const Vector &NormalVector, const Vector &SearchDirection)
 {
-        Info FunctionInfo(__func__);
   Vector helper;
   double radius, alpha;
-  Vector RelativeOldSphereCenter;
-  Vector RelativeNewSphereCenter;
-
-  RelativeOldSphereCenter.CopyVector(&OldSphereCenter);
-  RelativeOldSphereCenter.SubtractVector(&CircleCenter);
-  RelativeNewSphereCenter.CopyVector(&NewSphereCenter);
-  RelativeNewSphereCenter.SubtractVector(&CircleCenter);
-  helper.CopyVector(&RelativeNewSphereCenter);
+
+  helper.CopyVector(&NewSphereCenter);
   // test whether new center is on the parameter circle's plane
   if (fabs(helper.ScalarProduct(&CirclePlaneNormal)) > HULLEPSILON) {
-    DoeLog(1) && (eLog()<< Verbose(1) << "Something's very wrong here: NewSphereCenter is not on the band's plane as desired by " <<fabs(helper.ScalarProduct(&CirclePlaneNormal))  << "!" << endl);
+    eLog() << Verbose(0) << "ERROR: Something's very wrong here: NewSphereCenter is not on the band's plane as desired by " <<fabs(helper.ScalarProduct(&CirclePlaneNormal))  << "!" << endl;
     helper.ProjectOntoPlane(&CirclePlaneNormal);
   }
-  radius = helper.NormSquared();
+  radius = helper.ScalarProduct(&helper);
   // test whether the new center vector has length of CircleRadius
   if (fabs(radius - CircleRadius) > HULLEPSILON)
-    DoeLog(1) && (eLog()<< Verbose(1) << "The projected center of the new sphere has radius " << radius << " instead of " << CircleRadius << "." << endl);
-  alpha = helper.Angle(&RelativeOldSphereCenter);
+    eLog() << Verbose(1) << "ERROR: The projected center of the new sphere has radius " << radius << " instead of " << CircleRadius << "." << endl;
+  alpha = helper.Angle(&OldSphereCenter);
   // make the angle unique by checking the halfplanes/search direction
   if (helper.ScalarProduct(&SearchDirection) < -HULLEPSILON)  // acos is not unique on [0, 2.*M_PI), hence extra check to decide between two half intervals
     alpha = 2.*M_PI - alpha;
-  DoLog(1) && (Log() << Verbose(1) << "INFO: RelativeNewSphereCenter is " << helper << ", RelativeOldSphereCenter is " << RelativeOldSphereCenter << " and resulting angle is " << alpha << "." << endl);
-  radius = helper.Distance(&RelativeOldSphereCenter);
+  //Log() << Verbose(2) << "INFO: RelativeNewSphereCenter is " << helper << ", RelativeOldSphereCenter is " << OldSphereCenter << " and resulting angle is " << alpha << "." << endl;
+  radius = helper.Distance(&OldSphereCenter);
   helper.ProjectOntoPlane(&NormalVector);
   // check whether new center is somewhat away or at least right over the current baseline to prevent intersecting triangles
   if ((radius > HULLEPSILON) || (helper.Norm() < HULLEPSILON)) {
-    DoLog(1) && (Log() << Verbose(1) << "INFO: Distance between old and new center is " << radius << " and between new center and baseline center is " << helper.Norm() << "." << endl);
+    //Log() << Verbose(2) << "INFO: Distance between old and new center is " << radius << " and between new center and baseline center is " << helper.Norm() << "." << endl;
     return alpha;
   } else {
-    DoLog(1) && (Log() << Verbose(1) << "INFO: NewSphereCenter " << RelativeNewSphereCenter << " is too close to RelativeOldSphereCenter" << RelativeOldSphereCenter << "." << endl);
+    //Log() << Verbose(1) << "INFO: NewSphereCenter " << helper << " is too close to OldSphereCenter" << OldSphereCenter << "." << endl;
     return 2.*M_PI;
   }
@@ -275 +263 @@
 double MinIntersectDistance(const gsl_vector * x, void *params)
 {
-        Info FunctionInfo(__func__);
   double retval = 0;
   struct Intersection *I = (struct Intersection *)params;
@@ -296 +283 @@
 
   retval = HeightA.ScalarProduct(&HeightA) + HeightB.ScalarProduct(&HeightB);
-  //Log() << Verbose(1) << "MinIntersectDistance called, result: " << retval << endl;
+  //Log() << Verbose(2) << "MinIntersectDistance called, result: " << retval << endl;
 
   return retval;
@@ -316 +303 @@
 bool existsIntersection(const Vector &point1, const Vector &point2, const Vector &point3, const Vector &point4)
 {
-        Info FunctionInfo(__func__);
   bool result;
 
@@ -364 +350 @@
 
         if (status == GSL_SUCCESS) {
-          DoLog(1) && (Log() << Verbose(1) << "converged to minimum" <<  endl);
+          Log() << Verbose(2) << "converged to minimum" <<  endl;
         }
     } while (status == GSL_CONTINUE && iter < 100);
@@ -389 +375 @@
   t2 = HeightB.ScalarProduct(&SideB)/SideB.ScalarProduct(&SideB);
 
-  Log() << Verbose(1) << "Intersection " << intersection << " is at "
+  Log() << Verbose(2) << "Intersection " << intersection << " is at "
     << t1 << " for (" << point1 << "," << point2 << ") and at "
     << t2 << " for (" << point3 << "," << point4 << "): ";
 
   if (((t1 >= 0) && (t1 <= 1)) && ((t2 >= 0) && (t2 <= 1))) {
-    DoLog(1) && (Log() << Verbose(1) << "true intersection." << endl);
+    Log() << Verbose(0) << "true intersection." << endl;
     result = true;
   } else {
-    DoLog(1) && (Log() << Verbose(1) << "intersection out of region of interest." << endl);
+    Log() << Verbose(0) << "intersection out of region of interest." << endl;
     result = false;
   }
@@ -420 +406 @@
 double GetAngle(const Vector &point, const Vector &reference, const Vector &OrthogonalVector)
 {
-        Info FunctionInfo(__func__);
   if (reference.IsZero())
     return M_PI;
@@ -432 +417 @@
   }
 
-  DoLog(1) && (Log() << Verbose(1) << "INFO: " << point << " has angle " << phi << " with respect to reference " << reference << "." << endl);
+  Log() << Verbose(4) << "INFO: " << point << " has angle " << phi << " with respect to reference " << reference << "." << endl;
 
   return phi;
@@ -447 +432 @@
 double CalculateVolumeofGeneralTetraeder(const Vector &a, const Vector &b, const Vector &c, const Vector &d)
 {
-        Info FunctionInfo(__func__);
   Vector Point, TetraederVector[3];
   double volume;
@@ -471 +455 @@
 bool CheckLineCriteriaForDegeneratedTriangle(const BoundaryPointSet * const nodes[3])
 {
-        Info FunctionInfo(__func__);
   bool result = false;
   int counter = 0;
@@ -478 +461 @@
   for (int i=0;i<3;i++)
     for (int j=i+1; j<3; j++) {
-      if (nodes[i] == NULL) {
-        DoLog(1) && (Log() << Verbose(1) << "Node nr. " << i << " is not yet present." << endl);
-        result = true;
-      } else if (nodes[i]->lines.find(nodes[j]->node->nr) != nodes[i]->lines.end()) {  // there already is a line
+      if (nodes[i]->lines.find(nodes[j]->node->nr) != nodes[i]->lines.end()) {  // there already is a line
         LineMap::const_iterator FindLine;
         pair<LineMap::const_iterator,LineMap::const_iterator> FindPair;
@@ -493 +473 @@
         }
       } else { // no line
-        DoLog(1) && (Log() << Verbose(1) << "The line between " << *nodes[i] << " and " << *nodes[j] << " is not yet present, hence no need for a degenerate triangle." << endl);
+        Log() << Verbose(1) << "The line between " << *nodes[i] << " and " << *nodes[j] << " is not yet present, hence no need for a degenerate triangle." << endl;
         result = true;
       }
     }
   if ((!result) && (counter > 1)) {
-    DoLog(1) && (Log() << Verbose(1) << "INFO: Degenerate triangle is ok, at least two, here " << counter << ", existing lines are used." << endl);
+    Log() << Verbose(2) << "INFO: Degenerate triangle is ok, at least two, here " << counter << ", existing lines are used." << endl;
     result = true;
   }
@@ -505 +485 @@
 
 
-///** Sort function for the candidate list.
-// */
-//bool SortCandidates(const CandidateForTesselation* candidate1, const CandidateForTesselation* candidate2)
-//{
-//      Info FunctionInfo(__func__);
-//  Vector BaseLineVector, OrthogonalVector, helper;
-//  if (candidate1->BaseLine != candidate2->BaseLine) {  // sanity check
-//    DoeLog(1) && (eLog()<< Verbose(1) << "sortCandidates was called for two different baselines: " << candidate1->BaseLine << " and " << candidate2->BaseLine << "." << endl);
-//    //return false;
-//    exit(1);
-//  }
-//  // create baseline vector
-//  BaseLineVector.CopyVector(candidate1->BaseLine->endpoints[1]->node->node);
-//  BaseLineVector.SubtractVector(candidate1->BaseLine->endpoints[0]->node->node);
-//  BaseLineVector.Normalize();
-//
-//  // create normal in-plane vector to cope with acos() non-uniqueness on [0,2pi] (note that is pointing in the "right" direction already, hence ">0" test!)
-//  helper.CopyVector(candidate1->BaseLine->endpoints[0]->node->node);
-//  helper.SubtractVector(candidate1->point->node);
-//  OrthogonalVector.CopyVector(&helper);
-//  helper.VectorProduct(&BaseLineVector);
-//  OrthogonalVector.SubtractVector(&helper);
-//  OrthogonalVector.Normalize();
-//
-//  // calculate both angles and correct with in-plane vector
-//  helper.CopyVector(candidate1->point->node);
-//  helper.SubtractVector(candidate1->BaseLine->endpoints[0]->node->node);
-//  double phi = BaseLineVector.Angle(&helper);
-//  if (OrthogonalVector.ScalarProduct(&helper) > 0) {
-//    phi = 2.*M_PI - phi;
-//  }
-//  helper.CopyVector(candidate2->point->node);
-//  helper.SubtractVector(candidate1->BaseLine->endpoints[0]->node->node);
-//  double psi = BaseLineVector.Angle(&helper);
-//  if (OrthogonalVector.ScalarProduct(&helper) > 0) {
-//    psi = 2.*M_PI - psi;
-//  }
-//
-//  Log() << Verbose(1) << *candidate1->point << " has angle " << phi << endl;
-//  Log() << Verbose(1) << *candidate2->point << " has angle " << psi << endl;
-//
-//  // return comparison
-//  return phi < psi;
-//};
+/** Sort function for the candidate list.
+ */
+bool SortCandidates(const CandidateForTesselation* candidate1, const CandidateForTesselation* candidate2)
+{
+  Vector BaseLineVector, OrthogonalVector, helper;
+  if (candidate1->BaseLine != candidate2->BaseLine) {  // sanity check
+    Log() << Verbose(0) << "ERROR: sortCandidates was called for two different baselines: " << candidate1->BaseLine << " and " << candidate2->BaseLine << "." << endl;
+    //return false;
+    exit(1);
+  }
+  // create baseline vector
+  BaseLineVector.CopyVector(candidate1->BaseLine->endpoints[1]->node->node);
+  BaseLineVector.SubtractVector(candidate1->BaseLine->endpoints[0]->node->node);
+  BaseLineVector.Normalize();
+
+  // create normal in-plane vector to cope with acos() non-uniqueness on [0,2pi] (note that is pointing in the "right" direction already, hence ">0" test!)
+  helper.CopyVector(candidate1->BaseLine->endpoints[0]->node->node);
+  helper.SubtractVector(candidate1->point->node);
+  OrthogonalVector.CopyVector(&helper);
+  helper.VectorProduct(&BaseLineVector);
+  OrthogonalVector.SubtractVector(&helper);
+  OrthogonalVector.Normalize();
+
+  // calculate both angles and correct with in-plane vector
+  helper.CopyVector(candidate1->point->node);
+  helper.SubtractVector(candidate1->BaseLine->endpoints[0]->node->node);
+  double phi = BaseLineVector.Angle(&helper);
+  if (OrthogonalVector.ScalarProduct(&helper) > 0) {
+    phi = 2.*M_PI - phi;
+  }
+  helper.CopyVector(candidate2->point->node);
+  helper.SubtractVector(candidate1->BaseLine->endpoints[0]->node->node);
+  double psi = BaseLineVector.Angle(&helper);
+  if (OrthogonalVector.ScalarProduct(&helper) > 0) {
+    psi = 2.*M_PI - psi;
+  }
+
+  Log() << Verbose(2) << *candidate1->point << " has angle " << phi << endl;
+  Log() << Verbose(2) << *candidate2->point << " has angle " << psi << endl;
+
+  // return comparison
+  return phi < psi;
+};
 
 /**
@@ -558 +537 @@
  * @return point which is second closest to the provided one
  */
-TesselPoint* FindSecondClosestTesselPoint(const Vector* Point, const LinkedCell* const LC)
-{
-        Info FunctionInfo(__func__);
+TesselPoint* FindSecondClosestPoint(const Vector* Point, const LinkedCell* const LC)
+{
   TesselPoint* closestPoint = NULL;
   TesselPoint* secondClosestPoint = NULL;
@@ -571 +549 @@
   for(int i=0;i<NDIM;i++) // store indices of this cell
     N[i] = LC->n[i];
-  DoLog(1) && (Log() << Verbose(1) << "INFO: Center cell is " << N[0] << ", " << N[1] << ", " << N[2] << " with No. " << LC->index << "." << endl);
+  Log() << Verbose(2) << "INFO: Center cell is " << N[0] << ", " << N[1] << ", " << N[2] << " with No. " << LC->index << "." << endl;
 
   LC->GetNeighbourBounds(Nlower, Nupper);
-  //Log() << Verbose(1) << endl;
+  //Log() << Verbose(0) << endl;
   for (LC->n[0] = Nlower[0]; LC->n[0] <= Nupper[0]; LC->n[0]++)
     for (LC->n[1] = Nlower[1]; LC->n[1] <= Nupper[1]; LC->n[1]++)
       for (LC->n[2] = Nlower[2]; LC->n[2] <= Nupper[2]; LC->n[2]++) {
-        const LinkedCell::LinkedNodes *List = LC->GetCurrentCell();
-        //Log() << Verbose(1) << "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << endl;
+        const LinkedNodes *List = LC->GetCurrentCell();
+        //Log() << Verbose(3) << "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << endl;
         if (List != NULL) {
-          for (LinkedCell::LinkedNodes::const_iterator Runner = List->begin(); Runner != List->end(); Runner++) {
+          for (LinkedNodes::const_iterator Runner = List->begin(); Runner != List->end(); Runner++) {
             helper.CopyVector(Point);
             helper.SubtractVector((*Runner)->node);
@@ -596 +574 @@
           }
         } else {
-          eLog() << Verbose(1) << "The current cell " << LC->n[0] << "," << LC->n[1] << ","
+          eLog() << Verbose(0) << "ERROR: The current cell " << LC->n[0] << "," << LC->n[1] << ","
             << LC->n[2] << " is invalid!" << endl;
         }
@@ -613 +591 @@
  * @return point which is closest to the provided one, NULL if none found
  */
-TesselPoint* FindClosestTesselPoint(const Vector* Point, TesselPoint *&SecondPoint, const LinkedCell* const LC)
-{
-        Info FunctionInfo(__func__);
+TesselPoint* FindClosestPoint(const Vector* Point, TesselPoint *&SecondPoint, const LinkedCell* const LC)
+{
   TesselPoint* closestPoint = NULL;
   SecondPoint = NULL;
@@ -626 +603 @@
   for(int i=0;i<NDIM;i++) // store indices of this cell
     N[i] = LC->n[i];
-  DoLog(1) && (Log() << Verbose(1) << "INFO: Center cell is " << N[0] << ", " << N[1] << ", " << N[2] << " with No. " << LC->index << "." << endl);
+  Log() << Verbose(3) << "INFO: Center cell is " << N[0] << ", " << N[1] << ", " << N[2] << " with No. " << LC->index << "." << endl;
 
   LC->GetNeighbourBounds(Nlower, Nupper);
-  //Log() << Verbose(1) << endl;
+  //Log() << Verbose(0) << endl;
   for (LC->n[0] = Nlower[0]; LC->n[0] <= Nupper[0]; LC->n[0]++)
     for (LC->n[1] = Nlower[1]; LC->n[1] <= Nupper[1]; LC->n[1]++)
       for (LC->n[2] = Nlower[2]; LC->n[2] <= Nupper[2]; LC->n[2]++) {
-        const LinkedCell::LinkedNodes *List = LC->GetCurrentCell();
-        //Log() << Verbose(1) << "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << endl;
+        const LinkedNodes *List = LC->GetCurrentCell();
+        //Log() << Verbose(3) << "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << endl;
         if (List != NULL) {
-          for (LinkedCell::LinkedNodes::const_iterator Runner = List->begin(); Runner != List->end(); Runner++) {
+          for (LinkedNodes::const_iterator Runner = List->begin(); Runner != List->end(); Runner++) {
             helper.CopyVector(Point);
             helper.SubtractVector((*Runner)->node);
-            double currentNorm = helper.NormSquared();
+            double currentNorm = helper. Norm();
             if (currentNorm < distance) {
               secondDistance = distance;
@@ -645 +622 @@
               distance = currentNorm;
               closestPoint = (*Runner);
-              //Log() << Verbose(1) << "INFO: New Nearest Neighbour is " << *closestPoint << "." << endl;
+              //Log() << Verbose(2) << "INFO: New Nearest Neighbour is " << *closestPoint << "." << endl;
             } else if (currentNorm < secondDistance) {
               secondDistance = currentNorm;
               SecondPoint = (*Runner);
-              //Log() << Verbose(1) << "INFO: New Second Nearest Neighbour is " << *SecondPoint << "." << endl;
+              //Log() << Verbose(2) << "INFO: New Second Nearest Neighbour is " << *SecondPoint << "." << endl;
             }
           }
         } else {
-          eLog() << Verbose(1) << "The current cell " << LC->n[0] << "," << LC->n[1] << ","
+          eLog() << Verbose(0) << "ERROR: The current cell " << LC->n[0] << "," << LC->n[1] << ","
             << LC->n[2] << " is invalid!" << endl;
         }
@@ -659 +636 @@
   // output
   if (closestPoint != NULL) {
-    DoLog(1) && (Log() << Verbose(1) << "Closest point is " << *closestPoint);
+    Log() << Verbose(2) << "Closest point is " << *closestPoint;
     if (SecondPoint != NULL)
-      DoLog(0) && (Log() << Verbose(0) << " and second closest is " << *SecondPoint);
-    DoLog(0) && (Log() << Verbose(0) << "." << endl);
+      Log() << Verbose(0) << " and second closest is " << *SecondPoint;
+    Log() << Verbose(0) << "." << endl;
   }
   return closestPoint;
@@ -675 +652 @@
 Vector * GetClosestPointBetweenLine(const BoundaryLineSet * const Base, const BoundaryLineSet * const OtherBase)
 {
-        Info FunctionInfo(__func__);
   // construct the plane of the two baselines (i.e. take both their directional vectors)
   Vector Normal;
@@ -686 +662 @@
   Normal.VectorProduct(&OtherBaseline);
   Normal.Normalize();
-  DoLog(1) && (Log() << Verbose(1) << "First direction is " << Baseline << ", second direction is " << OtherBaseline << ", normal of intersection plane is " << Normal << "." << endl);
+  Log() << 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)
@@ -703 +679 @@
   Normal.CopyVector(Intersection);
   Normal.SubtractVector(Base->endpoints[0]->node->node);
-  DoLog(1) && (Log() << Verbose(1) << "Found closest point on " << *Base << " at " << *Intersection << ", factor in line is " << fabs(Normal.ScalarProduct(&Baseline)/Baseline.NormSquared()) << "." << endl);
+  Log() << Verbose(3) << "Found closest point on " << *Base << " at " << *Intersection << ", factor in line is " << fabs(Normal.ScalarProduct(&Baseline)/Baseline.NormSquared()) << "." << endl;
 
   return Intersection;
@@ -716 +692 @@
 double DistanceToTrianglePlane(const Vector *x, const BoundaryTriangleSet * const triangle)
 {
-        Info FunctionInfo(__func__);
   double distance = 0.;
   if (x == NULL) {
@@ -733 +708 @@
 void WriteVrmlFile(ofstream * const vrmlfile, const Tesselation * const Tess, const PointCloud * const cloud)
 {
-        Info FunctionInfo(__func__);
   TesselPoint *Walker = NULL;
   int i;
@@ -764 +738 @@
     }
   } else {
-    DoeLog(1) && (eLog()<< Verbose(1) << "Given vrmlfile is " << vrmlfile << "." << endl);
+    eLog() << Verbose(0) << "ERROR: Given vrmlfile is " << vrmlfile << "." << endl;
   }
   delete(center);
@@ -777 +751 @@
 void IncludeSphereinRaster3D(ofstream * const rasterfile, const Tesselation * const Tess, const PointCloud * const cloud)
 {
-        Info FunctionInfo(__func__);
   Vector helper;
-
-  if (Tess->LastTriangle != NULL) {
-    // include the current position of the virtual sphere in the temporary raster3d file
-    Vector *center = cloud->GetCenter();
-    // make the circumsphere's center absolute again
-    helper.CopyVector(Tess->LastTriangle->endpoints[0]->node->node);
-    helper.AddVector(Tess->LastTriangle->endpoints[1]->node->node);
-    helper.AddVector(Tess->LastTriangle->endpoints[2]->node->node);
-    helper.Scale(1./3.);
-    helper.SubtractVector(center);
-    // and add to file plus translucency object
-    *rasterfile << "# current virtual sphere\n";
-    *rasterfile << "8\n  25.0    0.6     -1.0 -1.0 -1.0     0.2        0 0 0 0\n";
-    *rasterfile << "2\n  " << helper.x[0] << " " << helper.x[1] << " " << helper.x[2] << "\t" << 5. << "\t1 0 0\n";
-    *rasterfile << "9\n  terminating special property\n";
-    delete(center);
-  }
+  // include the current position of the virtual sphere in the temporary raster3d file
+  Vector *center = cloud->GetCenter();
+  // make the circumsphere's center absolute again
+  helper.CopyVector(Tess->LastTriangle->endpoints[0]->node->node);
+  helper.AddVector(Tess->LastTriangle->endpoints[1]->node->node);
+  helper.AddVector(Tess->LastTriangle->endpoints[2]->node->node);
+  helper.Scale(1./3.);
+  helper.SubtractVector(center);
+  // and add to file plus translucency object
+  *rasterfile << "# current virtual sphere\n";
+  *rasterfile << "8\n  25.0    0.6     -1.0 -1.0 -1.0     0.2        0 0 0 0\n";
+  *rasterfile << "2\n  " << helper.x[0] << " " << helper.x[1] << " " << helper.x[2] << "\t" << 5. << "\t1 0 0\n";
+  *rasterfile << "9\n  terminating special property\n";
+  delete(center);
 };
 
@@ -806 +776 @@
 void WriteRaster3dFile(ofstream * const rasterfile, const Tesselation * const Tess, const PointCloud * const cloud)
 {
-        Info FunctionInfo(__func__);
   TesselPoint *Walker = NULL;
   int i;
@@ -839 +808 @@
     *rasterfile << "9\n#  terminating special property\n";
   } else {
-    DoeLog(1) && (eLog()<< Verbose(1) << "Given rasterfile is " << rasterfile << "." << endl);
+    eLog() << Verbose(0) << "ERROR: Given rasterfile is " << rasterfile << "." << endl;
   }
   IncludeSphereinRaster3D(rasterfile, Tess, cloud);
@@ -852 +821 @@
 void WriteTecplotFile(ofstream * const tecplot, const Tesselation * const TesselStruct, const PointCloud * const cloud, const int N)
 {
-        Info FunctionInfo(__func__);
   if ((tecplot != NULL) && (TesselStruct != NULL)) {
     // write header
     *tecplot << "TITLE = \"3D CONVEX SHELL\"" << endl;
     *tecplot << "VARIABLES = \"X\" \"Y\" \"Z\" \"U\"" << endl;
-    *tecplot << "ZONE T=\"";
-    if (N < 0) {
-      *tecplot << cloud->GetName();
-    } else {
-      *tecplot << N << "-";
-      if (TesselStruct->LastTriangle != NULL) {
-        for (int i=0;i<3;i++)
-          *tecplot << (i==0 ? "" : "_") << TesselStruct->LastTriangle->endpoints[i]->node->Name;
-      } else {
-        *tecplot << "none";
-      }
-    }
+    *tecplot << "ZONE T=\"" << N << "-";
+    for (int i=0;i<3;i++)
+      *tecplot << (i==0 ? "" : "_") << TesselStruct->LastTriangle->endpoints[i]->node->Name;
     *tecplot << "\", N=" << TesselStruct->PointsOnBoundary.size() << ", E=" << TesselStruct->TrianglesOnBoundary.size() << ", DATAPACKING=POINT, ZONETYPE=FETRIANGLE" << endl;
-    int i=cloud->GetMaxId();
+    int i=0;
+    for (cloud->GoToFirst(); !cloud->IsEnd(); cloud->GoToNext(), i++);
     int *LookupList = new int[i];
     for (cloud->GoToFirst(), i=0; !cloud->IsEnd(); cloud->GoToNext(), i++)
@@ -876 +836 @@
 
     // print atom coordinates
+    Log() << Verbose(2) << "The following triangles were created:";
     int Counter = 1;
     TesselPoint *Walker = NULL;
@@ -885 +846 @@
     *tecplot << endl;
     // print connectivity
-    DoLog(1) && (Log() << Verbose(1) << "The following triangles were created:" << endl);
     for (TriangleMap::const_iterator runner = TesselStruct->TrianglesOnBoundary.begin(); runner != TesselStruct->TrianglesOnBoundary.end(); runner++) {
-      DoLog(1) && (Log() << Verbose(1) << " " << runner->second->endpoints[0]->node->Name << "<->" << runner->second->endpoints[1]->node->Name << "<->" << runner->second->endpoints[2]->node->Name << endl);
+      Log() << Verbose(0) << " " << runner->second->endpoints[0]->node->Name << "<->" << runner->second->endpoints[1]->node->Name << "<->" << runner->second->endpoints[2]->node->Name;
       *tecplot << LookupList[runner->second->endpoints[0]->node->nr] << " " << LookupList[runner->second->endpoints[1]->node->nr] << " " << LookupList[runner->second->endpoints[2]->node->nr] << endl;
     }
     delete[] (LookupList);
+    Log() << Verbose(0) << endl;
   }
 };
@@ -901 +862 @@
 void CalculateConcavityPerBoundaryPoint(const Tesselation * const TesselStruct)
 {
-        Info FunctionInfo(__func__);
   class BoundaryPointSet *point = NULL;
   class BoundaryLineSet *line = NULL;
 
+  //Log() << Verbose(2) << "Begin of CalculateConcavityPerBoundaryPoint" << endl;
   // calculate remaining concavity
   for (PointMap::const_iterator PointRunner = TesselStruct->PointsOnBoundary.begin(); PointRunner != TesselStruct->PointsOnBoundary.end(); PointRunner++) {
     point = PointRunner->second;
-    DoLog(1) && (Log() << Verbose(1) << "INFO: Current point is " << *point << "." << endl);
+    Log() << Verbose(1) << "INFO: Current point is " << *point << "." << endl;
     point->value = 0;
     for (LineMap::iterator LineRunner = point->lines.begin(); LineRunner != point->lines.end(); LineRunner++) {
       line = LineRunner->second;
-      //Log() << Verbose(1) << "INFO: Current line of point " << *point << " is " << *line << "." << endl;
+      //Log() << Verbose(2) << "INFO: Current line of point " << *point << " is " << *line << "." << endl;
       if (!line->CheckConvexityCriterion())
         point->value += 1;
     }
   }
+  //Log() << Verbose(2) << "End of CalculateConcavityPerBoundaryPoint" << endl;
 };
 
@@ -927 +889 @@
 bool CheckListOfBaselines(const Tesselation * const TesselStruct)
 {
-        Info FunctionInfo(__func__);
   LineMap::const_iterator testline;
   bool result = false;
   int counter = 0;
 
-  DoLog(1) && (Log() << Verbose(1) << "Check: List of Baselines with not two connected triangles:" << endl);
+  Log() << Verbose(1) << "Check: List of Baselines with not two connected triangles:" << endl;
   for (testline = TesselStruct->LinesOnBoundary.begin(); testline != TesselStruct->LinesOnBoundary.end(); testline++) {
     if (testline->second->triangles.size() != 2) {
-      DoLog(2) && (Log() << Verbose(2) << *testline->second << "\t" << testline->second->triangles.size() << endl);
+      Log() << Verbose(1) << *testline->second << "\t" << testline->second->triangles.size() << endl;
       counter++;
     }
   }
   if (counter == 0) {
-    DoLog(1) && (Log() << Verbose(1) << "None." << endl);
+    Log() << Verbose(1) << "None." << endl;
     result = true;
   }
@@ -946 +907 @@
 }
 
-/** Counts the number of triangle pairs that contain the given polygon.
- * \param *P polygon with endpoints to look for
- * \param *T set of triangles to create pairs from containing \a *P
- */
-int CountTrianglePairContainingPolygon(const BoundaryPolygonSet * const P, const TriangleSet * const T)
-{
-  Info FunctionInfo(__func__);
-  // check number of endpoints in *P
-  if (P->endpoints.size() != 4) {
-    DoeLog(1) && (eLog()<< Verbose(1) << "CountTrianglePairContainingPolygon works only on polygons with 4 nodes!" << endl);
-    return 0;
-  }
-
-  // check number of triangles in *T
-  if (T->size() < 2) {
-    DoeLog(1) && (eLog()<< Verbose(1) << "Not enough triangles to have pairs!" << endl);
-    return 0;
-  }
-
-  DoLog(0) && (Log() << Verbose(0) << "Polygon is " << *P << endl);
-  // create each pair, get the endpoints and check whether *P is contained.
-  int counter = 0;
-  PointSet Trianglenodes;
-  class BoundaryPolygonSet PairTrianglenodes;
-  for(TriangleSet::iterator Walker = T->begin(); Walker != T->end(); Walker++) {
-    for (int i=0;i<3;i++)
-      Trianglenodes.insert((*Walker)->endpoints[i]);
-
-    for(TriangleSet::iterator PairWalker = Walker; PairWalker != T->end(); PairWalker++) {
-      if (Walker != PairWalker) { // skip first
-        PairTrianglenodes.endpoints = Trianglenodes;
-        for (int i=0;i<3;i++)
-          PairTrianglenodes.endpoints.insert((*PairWalker)->endpoints[i]);
-        const int size = PairTrianglenodes.endpoints.size();
-        if (size == 4) {
-          DoLog(0) && (Log() << Verbose(0) << " Current pair of triangles: " << **Walker << "," << **PairWalker << " with " << size << " distinct endpoints:" << PairTrianglenodes << endl);
-          // now check
-          if (PairTrianglenodes.ContainsPresentTupel(P)) {
-            counter++;
-            DoLog(0) && (Log() << Verbose(0) << "  ACCEPT: Matches with " << *P << endl);
-          } else {
-            DoLog(0) && (Log() << Verbose(0) << "  REJECT: No match with " << *P << endl);
-          }
-        } else {
-          DoLog(0) && (Log() << Verbose(0) << "  REJECT: Less than four endpoints." << endl);
-        }
-      }
-    }
-    Trianglenodes.clear();
-  }
-  return counter;
-};
-
-/** Checks whether two give polygons have two or more points in common.
- * \param *P1 first polygon
- * \param *P2 second polygon
- * \return true - are connected, false = are note
- */
-bool ArePolygonsEdgeConnected(const BoundaryPolygonSet * const P1, const BoundaryPolygonSet * const P2)
-{
-  Info FunctionInfo(__func__);
-  int counter = 0;
-  for(PointSet::const_iterator Runner = P1->endpoints.begin(); Runner != P1->endpoints.end(); Runner++) {
-    if (P2->ContainsBoundaryPoint((*Runner))) {
-      counter++;
-      DoLog(1) && (Log() << Verbose(1) << *(*Runner) << " of second polygon is found in the first one." << endl);
-      return true;
-    }
-  }
-  return false;
-};
-
-/** Combines second into the first and deletes the second.
- * \param *P1 first polygon, contains all nodes on return
- * \param *&P2 second polygon, is deleted.
- */
-void CombinePolygons(BoundaryPolygonSet * const P1, BoundaryPolygonSet * &P2)
-{
-  Info FunctionInfo(__func__);
-  pair <PointSet::iterator, bool> Tester;
-  for(PointSet::iterator Runner = P2->endpoints.begin(); Runner != P2->endpoints.end(); Runner++) {
-    Tester = P1->endpoints.insert((*Runner));
-    if (Tester.second)
-      DoLog(0) && (Log() << Verbose(0) << "Inserting endpoint " << *(*Runner) << " into first polygon." << endl);
-  }
-  P2->endpoints.clear();
-  delete(P2);
-};
-