Changeset 543ce4 for molecuilder/src/tesselationhelpers.cpp

Timestamp:

Nov 4, 2009, 7:56:04 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

4ef101, aa8542

Parents:

ec70ec

Message:

Huge change from ofstream * (const) out --> Log().

• first shift was done via regular expressions
• then via error messages from the code
• note that class atom, class element and class molecule kept in parts their output stream, was they print to file.
• make check runs fine
• MISSING: Verbosity is not fixed for everything (i.e. if no endl; is present and next has Verbose(0) ...)

Signed-off-by: Frederik Heber <heber@…>

File:

• molecuilder/src/tesselationhelpers.cpp (modified) (37 diffs)

molecuilder/src/tesselationhelpers.cpp

@@ -9 +9 @@
 
 #include "linkedcell.hpp"
+#include "log.hpp"
 #include "tesselation.hpp"
 #include "tesselationhelpers.hpp"
@@ -76 +77 @@
 
   if (fabs(m11) < MYEPSILON)
-    cerr << "ERROR: three points are colinear." << endl;
+    eLog() << Verbose(0) << "ERROR: three points are colinear." << endl;
 
   center->x[0] =  0.5 * m12/ m11;
@@ -83 +84 @@
 
   if (fabs(a.Distance(center) - RADIUS) > MYEPSILON)
-    cerr << "ERROR: 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);
@@ -113 +114 @@
   double Restradius;
   Vector OtherCenter;
-  cout << Verbose(3) << "Begin of GetCenterOfSphere.\n";
+  Log() << Verbose(3) << "Begin of GetCenterOfSphere.\n";
   Center->Zero();
   helper.CopyVector(&a);
@@ -127 +128 @@
   Center->Scale(1./(sin(2.*alpha) + sin(2.*beta) + sin(2.*gamma)));
   NewUmkreismittelpunkt->CopyVector(Center);
-  cout << Verbose(4) << "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
-  cout << Verbose(4) << "Center of circumference is " << *Center << " in direction " << *Direction << ".\n";
+  Log() << Verbose(4) << "Center of circumference is " << *Center << " in direction " << *Direction << ".\n";
 
   TempNormal.CopyVector(&a);
@@ -153 +154 @@
   TempNormal.Normalize();
   Restradius = sqrt(RADIUS*RADIUS - Umkreisradius*Umkreisradius);
-  cout << Verbose(4) << "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);
-  cout << Verbose(4) << "Shift vector to sphere of circumference is " << TempNormal << ".\n";
+  Log() << Verbose(4) << "Shift vector to sphere of circumference is " << TempNormal << ".\n";
 
   Center->AddVector(&TempNormal);
-  cout << Verbose(0) << "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);
-  cout << Verbose(0) << "OtherCenter of sphere of circumference is " << OtherCenter << ".\n";
-  cout << Verbose(3) << "End of GetCenterOfSphere.\n";
+  Log() << Verbose(0) << "OtherCenter of sphere of circumference is " << OtherCenter << ".\n";
+  Log() << Verbose(3) << "End of GetCenterOfSphere.\n";
 };
 
@@ -185 +186 @@
   beta = M_PI - SideC.Angle(&SideA);
   gamma = M_PI - SideA.Angle(&SideB);
-  //cout << Verbose(3) << "INFO: alpha = " << alpha/M_PI*180. << ", beta = " << beta/M_PI*180. << ", gamma = " << 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)
-    cerr << "GetCenterofCircumcircle: Sum of angles " << (alpha+beta+gamma)/M_PI*180. << " > 180 degrees by " << fabs(M_PI - alpha - beta - gamma)/M_PI*180. << "!" << endl;
+    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 +224 @@
   // test whether new center is on the parameter circle's plane
   if (fabs(helper.ScalarProduct(&CirclePlaneNormal)) > HULLEPSILON) {
-    cerr << "ERROR: 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);
   }
@@ -229 +230 @@
   // test whether the new center vector has length of CircleRadius
   if (fabs(radius - CircleRadius) > HULLEPSILON)
-    cerr << Verbose(1) << "ERROR: The projected center of the new sphere has radius " << radius << " instead of " << CircleRadius << "." << endl;
+    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;
-  //cout << Verbose(2) << "INFO: RelativeNewSphereCenter is " << helper << ", RelativeOldSphereCenter is " << OldSphereCenter << " and resulting angle is " << alpha << "." << endl;
+  //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)) {
-    //cout << Verbose(2) << "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 {
-    //cout << Verbose(1) << "INFO: NewSphereCenter " << helper << " is too close to OldSphereCenter" << OldSphereCenter << "." << endl;
+    //Log() << Verbose(1) << "INFO: NewSphereCenter " << helper << " is too close to OldSphereCenter" << OldSphereCenter << "." << endl;
     return 2.*M_PI;
   }
@@ -282 +283 @@
 
   retval = HeightA.ScalarProduct(&HeightA) + HeightB.ScalarProduct(&HeightB);
-  //cout << Verbose(2) << "MinIntersectDistance called, result: " << retval << endl;
+  //Log() << Verbose(2) << "MinIntersectDistance called, result: " << retval << endl;
 
   return retval;
@@ -349 +350 @@
 
         if (status == GSL_SUCCESS) {
-          cout << Verbose(2) << "converged to minimum" <<  endl;
+          Log() << Verbose(2) << "converged to minimum" <<  endl;
         }
     } while (status == GSL_CONTINUE && iter < 100);
@@ -374 +375 @@
   t2 = HeightB.ScalarProduct(&SideB)/SideB.ScalarProduct(&SideB);
 
-  cout << Verbose(2) << "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))) {
-    cout << "true intersection." << endl;
+    Log() << Verbose(0) << "true intersection." << endl;
     result = true;
   } else {
-    cout << "intersection out of region of interest." << endl;
+    Log() << Verbose(0) << "intersection out of region of interest." << endl;
     result = false;
   }
@@ -416 +417 @@
   }
 
-  cout << Verbose(4) << "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;
@@ -472 +473 @@
         }
       } else { // no line
-        cout << 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)) {
-    cout << Verbose(2) << "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;
   }
@@ -490 +491 @@
   Vector BaseLineVector, OrthogonalVector, helper;
   if (candidate1->BaseLine != candidate2->BaseLine) {  // sanity check
-    cout << Verbose(0) << "ERROR: sortCandidates was called for two different baselines: " << candidate1->BaseLine << " and " << candidate2->BaseLine << "." << endl;
+    Log() << Verbose(0) << "ERROR: sortCandidates was called for two different baselines: " << candidate1->BaseLine << " and " << candidate2->BaseLine << "." << endl;
     //return false;
     exit(1);
@@ -521 +522 @@
   }
 
-  cout << Verbose(2) << *candidate1->point << " has angle " << phi << endl;
-  cout << Verbose(2) << *candidate2->point << " has angle " << psi << endl;
+  Log() << Verbose(2) << *candidate1->point << " has angle " << phi << endl;
+  Log() << Verbose(2) << *candidate2->point << " has angle " << psi << endl;
 
   // return comparison
@@ -548 +549 @@
   for(int i=0;i<NDIM;i++) // store indices of this cell
     N[i] = LC->n[i];
-  cout << Verbose(2) << "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);
-  //cout << 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 LinkedNodes *List = LC->GetCurrentCell();
-        //cout << Verbose(3) << "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << endl;
+        //Log() << Verbose(3) << "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << endl;
         if (List != NULL) {
           for (LinkedNodes::const_iterator Runner = List->begin(); Runner != List->end(); Runner++) {
@@ -569 +570 @@
               distance = currentNorm;
               closestPoint = (*Runner);
-              //cout << Verbose(2) << "INFO: New Second Nearest Neighbour is " << *secondClosestPoint << "." << endl;
+              //Log() << Verbose(2) << "INFO: New Second Nearest Neighbour is " << *secondClosestPoint << "." << endl;
             }
           }
         } else {
-          cerr << "ERROR: 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;
         }
@@ -602 +603 @@
   for(int i=0;i<NDIM;i++) // store indices of this cell
     N[i] = LC->n[i];
-  cout << Verbose(3) << "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);
-  //cout << 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 LinkedNodes *List = LC->GetCurrentCell();
-        //cout << Verbose(3) << "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << endl;
+        //Log() << Verbose(3) << "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << endl;
         if (List != NULL) {
           for (LinkedNodes::const_iterator Runner = List->begin(); Runner != List->end(); Runner++) {
@@ -621 +622 @@
               distance = currentNorm;
               closestPoint = (*Runner);
-              //cout << Verbose(2) << "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);
-              //cout << Verbose(2) << "INFO: New Second Nearest Neighbour is " << *SecondPoint << "." << endl;
+              //Log() << Verbose(2) << "INFO: New Second Nearest Neighbour is " << *SecondPoint << "." << endl;
             }
           }
         } else {
-          cerr << "ERROR: 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;
         }
@@ -635 +636 @@
   // output
   if (closestPoint != NULL) {
-    cout << Verbose(2) << "Closest point is " << *closestPoint;
+    Log() << Verbose(2) << "Closest point is " << *closestPoint;
     if (SecondPoint != NULL)
-      cout << " and second closest is " << *SecondPoint;
-    cout << "." << endl;
+      Log() << Verbose(0) << " and second closest is " << *SecondPoint;
+    Log() << Verbose(0) << "." << endl;
   }
   return closestPoint;
@@ -649 +650 @@
  * \return Vector on reference line that has closest distance
  */
-Vector * GetClosestPointBetweenLine(ofstream *out, const BoundaryLineSet * const Base, const BoundaryLineSet * const OtherBase)
+Vector * GetClosestPointBetweenLine(const BoundaryLineSet * const Base, const BoundaryLineSet * const OtherBase)
 {
   // construct the plane of the two baselines (i.e. take both their directional vectors)
@@ -661 +662 @@
   Normal.VectorProduct(&OtherBaseline);
   Normal.Normalize();
-  *out << Verbose(4) << "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)
@@ -675 +676 @@
   // 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);
+  Intersection->GetIntersectionOfTwoLinesOnPlane(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;
+  Log() << Verbose(3) << "Found closest point on " << *Base << " at " << *Intersection << ", factor in line is " << fabs(Normal.ScalarProduct(&Baseline)/Baseline.NormSquared()) << "." << endl;
 
   return Intersection;
@@ -689 +690 @@
  * \return distance between \a *x and plane defined by \a *triangle, -1 - if something went wrong
  */
-double DistanceToTrianglePlane(ofstream * const out, const Vector *x, const BoundaryTriangleSet * const triangle)
+double DistanceToTrianglePlane(const Vector *x, const BoundaryTriangleSet * const triangle)
 {
   double distance = 0.;
@@ -695 +696 @@
     return -1;
   }
-  distance = x->DistanceToPlane(out, &triangle->NormalVector, triangle->endpoints[0]->node->node);
+  distance = x->DistanceToPlane(&triangle->NormalVector, triangle->endpoints[0]->node->node);
   return distance;
 };
@@ -705 +706 @@
  * \param *mol molecule structure with atom positions
  */
-void WriteVrmlFile(ofstream * const out, ofstream * const vrmlfile, const Tesselation * const Tess, const PointCloud * const cloud)
+void WriteVrmlFile(ofstream * const vrmlfile, const Tesselation * const Tess, const PointCloud * const cloud)
 {
   TesselPoint *Walker = NULL;
   int i;
-  Vector *center = cloud->GetCenter(out);
+  Vector *center = cloud->GetCenter();
   if (vrmlfile != NULL) {
-    //cout << Verbose(1) << "Writing Raster3D file ... ";
+    //Log() << Verbose(1) << "Writing Raster3D file ... ";
     *vrmlfile << "#VRML V2.0 utf8" << endl;
     *vrmlfile << "#Created by molecuilder" << endl;
@@ -737 +738 @@
     }
   } else {
-    cerr << "ERROR: Given vrmlfile is " << vrmlfile << "." << endl;
+    eLog() << Verbose(0) << "ERROR: Given vrmlfile is " << vrmlfile << "." << endl;
   }
   delete(center);
@@ -748 +749 @@
  * \param *mol molecule structure with atom positions
  */
-void IncludeSphereinRaster3D(ofstream * const out, ofstream * const rasterfile, const Tesselation * const Tess, const PointCloud * const cloud)
+void IncludeSphereinRaster3D(ofstream * const rasterfile, const Tesselation * const Tess, const PointCloud * const cloud)
 {
   Vector helper;
   // include the current position of the virtual sphere in the temporary raster3d file
-  Vector *center = cloud->GetCenter(out);
+  Vector *center = cloud->GetCenter();
   // make the circumsphere's center absolute again
   helper.CopyVector(Tess->LastTriangle->endpoints[0]->node->node);
@@ -773 +774 @@
  * \param *mol molecule structure with atom positions
  */
-void WriteRaster3dFile(ofstream * const out, ofstream * const rasterfile, const Tesselation * const Tess, const PointCloud * const cloud)
+void WriteRaster3dFile(ofstream * const rasterfile, const Tesselation * const Tess, const PointCloud * const cloud)
 {
   TesselPoint *Walker = NULL;
   int i;
-  Vector *center = cloud->GetCenter(out);
+  Vector *center = cloud->GetCenter();
   if (rasterfile != NULL) {
-    //cout << Verbose(1) << "Writing Raster3D file ... ";
+    //Log() << Verbose(1) << "Writing Raster3D file ... ";
     *rasterfile << "# Raster3D object description, created by MoleCuilder" << endl;
     *rasterfile << "@header.r3d" << endl;
@@ -807 +808 @@
     *rasterfile << "9\n#  terminating special property\n";
   } else {
-    cerr << "ERROR: Given rasterfile is " << rasterfile << "." << endl;
-  }
-  IncludeSphereinRaster3D(out, rasterfile, Tess, cloud);
+    eLog() << Verbose(0) << "ERROR: Given rasterfile is " << rasterfile << "." << endl;
+  }
+  IncludeSphereinRaster3D(rasterfile, Tess, cloud);
   delete(center);
 };
@@ -818 +819 @@
  * \param N arbitrary number to differentiate various zones in the tecplot format
  */
-void WriteTecplotFile(ofstream * const out, ofstream * const tecplot, const Tesselation * const TesselStruct, const PointCloud * const cloud, const int N)
+void WriteTecplotFile(ofstream * const tecplot, const Tesselation * const TesselStruct, const PointCloud * const cloud, const int N)
 {
   if ((tecplot != NULL) && (TesselStruct != NULL)) {
@@ -835 +836 @@
 
     // print atom coordinates
-    *out << Verbose(2) << "The following triangles were created:";
+    Log() << Verbose(2) << "The following triangles were created:";
     int Counter = 1;
     TesselPoint *Walker = NULL;
@@ -846 +847 @@
     // print connectivity
     for (TriangleMap::const_iterator runner = TesselStruct->TrianglesOnBoundary.begin(); runner != TesselStruct->TrianglesOnBoundary.end(); runner++) {
-      *out << " " << runner->second->endpoints[0]->node->Name << "<->" << runner->second->endpoints[1]->node->Name << "<->" << runner->second->endpoints[2]->node->Name;
+      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);
-    *out << endl;
+    Log() << Verbose(0) << endl;
   }
 };
@@ -859 +860 @@
  * \param *TesselStruct pointer to Tesselation structure
  */
-void CalculateConcavityPerBoundaryPoint(ofstream * const out, const Tesselation * const TesselStruct)
+void CalculateConcavityPerBoundaryPoint(const Tesselation * const TesselStruct)
 {
   class BoundaryPointSet *point = NULL;
   class BoundaryLineSet *line = NULL;
 
-  //*out << Verbose(2) << "Begin of CalculateConcavityPerBoundaryPoint" << endl;
+  //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;
-    *out << 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;
-      //*out << Verbose(2) << "INFO: Current line of point " << *point << " is " << *line << "." << endl;
-      if (!line->CheckConvexityCriterion(out))
+      //Log() << Verbose(2) << "INFO: Current line of point " << *point << " is " << *line << "." << endl;
+      if (!line->CheckConvexityCriterion())
         point->value += 1;
     }
   }
-  //*out << Verbose(2) << "End of CalculateConcavityPerBoundaryPoint" << endl;
+  //Log() << Verbose(2) << "End of CalculateConcavityPerBoundaryPoint" << endl;
 };
 
@@ -886 +887 @@
  * \return true - all have exactly two triangles, false - some not, list is printed to screen
  */
-bool CheckListOfBaselines(ofstream * const out, const Tesselation * const TesselStruct)
+bool CheckListOfBaselines(const Tesselation * const TesselStruct)
 {
   LineMap::const_iterator testline;
@@ -892 +893 @@
   int counter = 0;
 
-  *out << 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) {
-      *out << Verbose(1) << *testline->second << "\t" << testline->second->triangles.size() << endl;
+      Log() << Verbose(1) << *testline->second << "\t" << testline->second->triangles.size() << endl;
       counter++;
     }
   }
   if (counter == 0) {
-    *out << Verbose(1) << "None." << endl;
+    Log() << Verbose(1) << "None." << endl;
     result = true;
   }