Ignore:
Timestamp:
Nov 3, 2011, 7:44:01 PM (13 years ago)
Author:
Frederik Heber <heber@…>
Branches:
Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable
Children:
41a467
Parents:
50e4e5
git-author:
Frederik Heber <heber@…> (10/27/11 11:53:58)
git-committer:
Frederik Heber <heber@…> (11/03/11 19:44:01)
Message:

HUGE: Removed all calls to Log(), eLog(), replaced by LOG() and ELOG().

  • Replaced DoLog(.) && (Log() << Verbose(.) << ... << std::endl) by Log(., ...).
  • Replaced Log() << Verbose(.) << .. << by Log(., ...)
  • on multiline used stringstream to generate and message which was finally used in LOG(., output.str())
  • there should be no more occurence of Log(). LOG() and ELOG() must be used instead.
  • Eventually, this will allow for storing all errors and re-printing them on program exit which would be very helpful to ascertain error-free runs for the user.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/Tesselation/tesselationhelpers.cpp

    r50e4e5 r47d041  
    7676
    7777  if (fabs(m11) < MYEPSILON)
    78     DoeLog(1) && (eLog()<< Verbose(1) << "three points are colinear." << endl);
     78    ELOG(1, "three points are colinear.");
    7979
    8080  center->at(0) =  0.5 * m12/ m11;
    … …  
    8383
    8484  if (fabs(a.distance(*center) - RADIUS) > MYEPSILON)
    85     DoeLog(1) && (eLog()<< Verbose(1) << "The given center is further way by " << fabs(a.distance(*center) - RADIUS) << " from a than RADIUS." << endl);
     85    ELOG(1, "The given center is further way by " << fabs(a.distance(*center) - RADIUS) << " from a than RADIUS.");
    8686};
    8787
    … …  
    122122  Center->Scale(1./(sin(2.*alpha) + sin(2.*beta) + sin(2.*gamma)));
    123123  (*NewUmkreismittelpunkt) = (*Center);
    124   DoLog(1) && (Log() << Verbose(1) << "Center of new circumference is " << *NewUmkreismittelpunkt << ".\n");
     124  LOG(2, "INFO: Center of new circumference is " << *NewUmkreismittelpunkt << ".");
    125125  // Here we calculated center of circumscribing circle, using barycentric coordinates
    126   DoLog(1) && (Log() << Verbose(1) << "Center of circumference is " << *Center << " in direction " << *Direction << ".\n");
     126  LOG(2, "INFO: Center of circumference is " << *Center << " in direction " << *Direction << ".");
    127127
    128128  TempNormal = a - b;
    … …  
    146146  TempNormal.Normalize();
    147147  Restradius = sqrt(RADIUS*RADIUS - Umkreisradius*Umkreisradius);
    148   DoLog(1) && (Log() << Verbose(1) << "Height of center of circumference to center of sphere is " << Restradius << ".\n");
     148  LOG(2, "Height of center of circumference to center of sphere is " << Restradius << ".");
    149149  TempNormal.Scale(Restradius);
    150   DoLog(1) && (Log() << Verbose(1) << "Shift vector to sphere of circumference is " << TempNormal << ".\n");
     150  LOG(2, "Shift vector to sphere of circumference is " << TempNormal << ".");
    151151  (*Center) += TempNormal;
    152   DoLog(1) && (Log() << Verbose(1) << "Center of sphere of circumference is " << *Center << ".\n");
     152  LOG(2, "Center of sphere of circumference is " << *Center << ".");
    153153  GetSphere(&OtherCenter, a, b, c, RADIUS);
    154   DoLog(1) && (Log() << Verbose(1) << "OtherCenter of sphere of circumference is " << OtherCenter << ".\n");
     154  LOG(2, "OtherCenter of sphere of circumference is " << OtherCenter << ".");
    155155};
    156156
    … …  
    180180  if (fabs(helper[0]+helper[1]+helper[2]) > MYEPSILON)
    181181    Center.Scale(1./(helper[0]+helper[1]+helper[2]));
    182   Log() << Verbose(1) << "INFO: Center (2nd algo) is at " << Center << "." << endl;
     182  LOG(1, "INFO: Center (2nd algo) is at " << Center << ".");
    183183};
    184184
    … …  
    208208  // test whether new center is on the parameter circle's plane
    209209  if (fabs(helper.ScalarProduct(CirclePlaneNormal)) > HULLEPSILON) {
    210     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);
     210    ELOG(1, "Something's very wrong here: NewSphereCenter is not on the band's plane as desired by " <<fabs(helper.ScalarProduct(CirclePlaneNormal))  << "!");
    211211    helper.ProjectOntoPlane(CirclePlaneNormal);
    212212  }
    … …  
    214214  // test whether the new center vector has length of CircleRadius
    215215  if (fabs(radius - CircleRadius) > HULLEPSILON)
    216     DoeLog(1) && (eLog()<< Verbose(1) << "The projected center of the new sphere has radius " << radius << " instead of " << CircleRadius << "." << endl);
     216    ELOG(1, "The projected center of the new sphere has radius " << radius << " instead of " << CircleRadius << ".");
    217217  alpha = helper.Angle(RelativeOldSphereCenter);
    218218  // make the angle unique by checking the halfplanes/search direction
    219219  if (helper.ScalarProduct(SearchDirection) < -HULLEPSILON)  // acos is not unique on [0, 2.*M_PI), hence extra check to decide between two half intervals
    220220    alpha = 2.*M_PI - alpha;
    221   DoLog(1) && (Log() << Verbose(1) << "INFO: RelativeNewSphereCenter is " << helper << ", RelativeOldSphereCenter is " << RelativeOldSphereCenter << " and resulting angle is " << alpha << "." << endl);
     221  LOG(1, "INFO: RelativeNewSphereCenter is " << helper << ", RelativeOldSphereCenter is " << RelativeOldSphereCenter << " and resulting angle is " << alpha << ".");
    222222  radius = helper.distance(RelativeOldSphereCenter);
    223223  helper.ProjectOntoPlane(NormalVector);
    224224  // check whether new center is somewhat away or at least right over the current baseline to prevent intersecting triangles
    225225  if ((radius > HULLEPSILON) || (helper.Norm() < HULLEPSILON)) {
    226     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);
     226    LOG(1, "INFO: Distance between old and new center is " << radius << " and between new center and baseline center is " << helper.Norm() << ".");
    227227    return alpha;
    228228  } else {
    229     DoLog(1) && (Log() << Verbose(1) << "INFO: NewSphereCenter " << RelativeNewSphereCenter << " is too close to RelativeOldSphereCenter" << RelativeOldSphereCenter << "." << endl);
     229    LOG(1, "INFO: NewSphereCenter " << RelativeNewSphereCenter << " is too close to RelativeOldSphereCenter" << RelativeOldSphereCenter << ".");
    230230    return 2.*M_PI;
    231231  }
    … …  
    262262  }
    263263
    264   DoLog(1) && (Log() << Verbose(1) << "INFO: " << point << " has angle " << phi << " with respect to reference " << reference << "." << endl);
     264  LOG(1, "INFO: " << point << " has angle " << phi << " with respect to reference " << reference << ".");
    265265
    266266  return phi;
    … …  
    329329    for (int j=i+1; j<3; j++) {
    330330      if (nodes[i] == NULL) {
    331         DoLog(1) && (Log() << Verbose(1) << "Node nr. " << i << " is not yet present." << endl);
     331        LOG(1, "Node nr. " << i << " is not yet present.");
    332332        result = true;
    333333      } else if (nodes[i]->lines.find(nodes[j]->node->getNr()) != nodes[i]->lines.end()) {  // there already is a line
    … …  
    343343        }
    344344      } else { // no line
    345         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);
     345        LOG(1, "The line between " << *nodes[i] << " and " << *nodes[j] << " is not yet present, hence no need for a degenerate triangle.");
    346346        result = true;
    347347      }
    348348    }
    349349  if ((!result) && (counter > 1)) {
    350     DoLog(1) && (Log() << Verbose(1) << "INFO: Degenerate triangle is ok, at least two, here " << counter << ", existing lines are used." << endl);
     350    LOG(1, "INFO: Degenerate triangle is ok, at least two, here " << counter << ", existing lines are used.");
    351351    result = true;
    352352  }
    … …  
    362362//  Vector BaseLineVector, OrthogonalVector, helper;
    363363//  if (candidate1->BaseLine != candidate2->BaseLine) {  // sanity check
    364 //    DoeLog(1) && (eLog()<< Verbose(1) << "sortCandidates was called for two different baselines: " << candidate1->BaseLine << " and " << candidate2->BaseLine << "." << endl);
     364//    ELOG(1, "sortCandidates was called for two different baselines: " << candidate1->BaseLine << " and " << candidate2->BaseLine << ".");
    365365//    //return false;
    366366//    exit(1);
    … …  
    393393//  }
    394394//
    395 //  Log() << Verbose(1) << *candidate1->point << " has angle " << phi << endl;
    396 //  Log() << Verbose(1) << *candidate2->point << " has angle " << psi << endl;
     395//  LOG(1, *candidate1->point << " has angle " << phi);
     396//  LOG(1, *candidate2->point << " has angle " << psi);
    397397//
    398398//  // return comparison
    … …  
    421421  for(int i=0;i<NDIM;i++) // store indices of this cell
    422422    N[i] = LC->n[i];
    423   DoLog(1) && (Log() << Verbose(1) << "INFO: Center cell is " << N[0] << ", " << N[1] << ", " << N[2] << " with No. " << LC->index << "." << endl);
     423  LOG(1, "INFO: Center cell is " << N[0] << ", " << N[1] << ", " << N[2] << " with No. " << LC->index << ".");
    424424
    425425  LC->GetNeighbourBounds(Nlower, Nupper);
    426   //Log() << Verbose(1) << endl;
    427426  for (LC->n[0] = Nlower[0]; LC->n[0] <= Nupper[0]; LC->n[0]++)
    428427    for (LC->n[1] = Nlower[1]; LC->n[1] <= Nupper[1]; LC->n[1]++)
    429428      for (LC->n[2] = Nlower[2]; LC->n[2] <= Nupper[2]; LC->n[2]++) {
    430429        const TesselPointSTLList *List = LC->GetCurrentCell();
    431         //Log() << Verbose(1) << "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << endl;
     430        //LOG(1, "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2]);
    432431        if (List != NULL) {
    433432          for (TesselPointSTLList::const_iterator Runner = List->begin(); Runner != List->end(); Runner++) {
    … …  
    441440              distance = currentNorm;
    442441              closestPoint = (*Runner);
    443               //Log() << Verbose(2) << "INFO: New Second Nearest Neighbour is " << *secondClosestPoint << "." << endl;
     442              //LOG(2, "INFO: New Second Nearest Neighbour is " << *secondClosestPoint << ".");
    444443            }
    445444          }
    446445        } else {
    447           DoeLog(1) && (eLog() << Verbose(1) << "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << " is invalid!" << endl);
     446          ELOG(1, "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << " is invalid!");
    448447        }
    449448      }
    … …  
    474473  for(int i=0;i<NDIM;i++) // store indices of this cell
    475474    N[i] = LC->n[i];
    476   DoLog(1) && (Log() << Verbose(1) << "INFO: Center cell is " << N[0] << ", " << N[1] << ", " << N[2] << " with No. " << LC->index << "." << endl);
     475  LOG(1, "INFO: Center cell is " << N[0] << ", " << N[1] << ", " << N[2] << " with No. " << LC->index << ".");
    477476
    478477  LC->GetNeighbourBounds(Nlower, Nupper);
    479   //Log() << Verbose(1) << endl;
    480478  for (LC->n[0] = Nlower[0]; LC->n[0] <= Nupper[0]; LC->n[0]++)
    481479    for (LC->n[1] = Nlower[1]; LC->n[1] <= Nupper[1]; LC->n[1]++)
    482480      for (LC->n[2] = Nlower[2]; LC->n[2] <= Nupper[2]; LC->n[2]++) {
    483481        const TesselPointSTLList *List = LC->GetCurrentCell();
    484         //Log() << Verbose(1) << "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << endl;
     482        //LOG(1, "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2]);
    485483        if (List != NULL) {
    486484          for (TesselPointSTLList::const_iterator Runner = List->begin(); Runner != List->end(); Runner++) {
    … …  
    492490              distance = currentNorm;
    493491              closestPoint = (*Runner);
    494               //Log() << Verbose(1) << "INFO: New Nearest Neighbour is " << *closestPoint << "." << endl;
     492              //LOG(1, "INFO: New Nearest Neighbour is " << *closestPoint << ".");
    495493            } else if (currentNorm < secondDistance) {
    496494              secondDistance = currentNorm;
    497495              SecondPoint = (*Runner);
    498               //Log() << Verbose(1) << "INFO: New Second Nearest Neighbour is " << *SecondPoint << "." << endl;
     496              //LOG(1, "INFO: New Second Nearest Neighbour is " << *SecondPoint << ".");
    499497            }
    500498          }
    501499        } else {
    502           DoeLog(1) && (eLog() << Verbose(1) << "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << " is invalid!" << endl);
     500          ELOG(1, "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << " is invalid!");
    503501        }
    504502      }
    505503  // output
    506504  if (closestPoint != NULL) {
    507     DoLog(1) && (Log() << Verbose(1) << "Closest point is " << *closestPoint);
    508     if (SecondPoint != NULL)
    509       DoLog(0) && (Log() << Verbose(0) << " and second closest is " << *SecondPoint);
    510     DoLog(0) && (Log() << Verbose(0) << "." << endl);
     505    if (DoLog(1)) {
     506      std::stringstream output;
     507      output << "Closest point is " << *closestPoint;
     508      if (SecondPoint != NULL)
     509        output << " and second closest is " << *SecondPoint;
     510      LOG(0, output.str() << ".");
     511    }
    511512  }
    512513  return closestPoint;
    … …  
    528529  Normal.VectorProduct(OtherBaseline);
    529530  Normal.Normalize();
    530   DoLog(1) && (Log() << Verbose(1) << "First direction is " << Baseline << ", second direction is " << OtherBaseline << ", normal of intersection plane is " << Normal << "." << endl);
     531  LOG(1, "First direction is " << Baseline << ", second direction is " << OtherBaseline << ", normal of intersection plane is " << Normal << ".");
    531532
    532533  // project one offset point of OtherBase onto this plane (and add plane offset vector)
    … …  
    542543  *Intersection = line1.getIntersection(line2);
    543544  Normal = (*Intersection) - (Base->endpoints[0]->node->getPosition());
    544   DoLog(1) && (Log() << Verbose(1) << "Found closest point on " << *Base << " at " << *Intersection << ", factor in line is " << fabs(Normal.ScalarProduct(Baseline)/Baseline.NormSquared()) << "." << endl);
     545  LOG(1, "Found closest point on " << *Base << " at " << *Intersection << ", factor in line is " << fabs(Normal.ScalarProduct(Baseline)/Baseline.NormSquared()) << ".");
    545546
    546547  return Intersection;
    … …  
    577578  Vector *center = cloud.GetCenter();
    578579  if (vrmlfile != NULL) {
    579     //Log() << Verbose(1) << "Writing Raster3D file ... ";
     580    LOG(1, "INFO: Writing Raster3D file ... ");
    580581    *vrmlfile << "#VRML V2.0 utf8" << endl;
    581582    *vrmlfile << "#Created by molecuilder" << endl;
    … …  
    603604    }
    604605  } else {
    605     DoeLog(1) && (eLog()<< Verbose(1) << "Given vrmlfile is " << vrmlfile << "." << endl);
     606    ELOG(1, "Given vrmlfile is " << vrmlfile << ".");
    606607  }
    607608  delete(center);
    … …  
    649650  Vector *center = cloud.GetCenter();
    650651  if (rasterfile != NULL) {
    651     //Log() << Verbose(1) << "Writing Raster3D file ... ";
     652    LOG(1, "INFO: Writing Raster3D file ... ");
    652653    *rasterfile << "# Raster3D object description, created by MoleCuilder" << endl;
    653654    *rasterfile << "@header.r3d" << endl;
    … …  
    681682    *rasterfile << "9\n#  terminating special property\n";
    682683  } else {
    683     DoeLog(1) && (eLog()<< Verbose(1) << "Given rasterfile is " << rasterfile << "." << endl);
     684    ELOG(1, "Given rasterfile is " << rasterfile << ".");
    684685  }
    685686  IncludeSphereinRaster3D(rasterfile, Tess, cloud);
    … …  
    734735    *tecplot << endl;
    735736    // print connectivity
    736     DoLog(1) && (Log() << Verbose(1) << "The following triangles were created:" << endl);
     737    LOG(1, "The following triangles were created:");
    737738    for (TriangleMap::const_iterator runner = TesselStruct->TrianglesOnBoundary.begin(); runner != TesselStruct->TrianglesOnBoundary.end(); runner++) {
    738       DoLog(1) && (Log() << Verbose(1) << " " << runner->second->endpoints[0]->node->getName() << "<->" << runner->second->endpoints[1]->node->getName() << "<->" << runner->second->endpoints[2]->node->getName() << endl);
     739      LOG(1, " " << runner->second->endpoints[0]->node->getName() << "<->" << runner->second->endpoints[1]->node->getName() << "<->" << runner->second->endpoints[2]->node->getName());
    739740      *tecplot << LookupList[runner->second->endpoints[0]->node->getNr()] << " " << LookupList[runner->second->endpoints[1]->node->getNr()] << " " << LookupList[runner->second->endpoints[2]->node->getNr()] << endl;
    740741    }
    … …  
    761762  for (PointMap::const_iterator PointRunner = TesselStruct->PointsOnBoundary.begin(); PointRunner != TesselStruct->PointsOnBoundary.end(); PointRunner++) {
    762763    point = PointRunner->second;
    763     DoLog(1) && (Log() << Verbose(1) << "INFO: Current point is " << *point << "." << endl);
     764    LOG(1, "INFO: Current point is " << *point << ".");
    764765
    765766    // calculate mean concavity over all connected line
    … …  
    767768    for (LineMap::iterator LineRunner = point->lines.begin(); LineRunner != point->lines.end(); LineRunner++) {
    768769      line = LineRunner->second;
    769       //Log() << Verbose(1) << "INFO: Current line of point " << *point << " is " << *line << "." << endl;
     770      //LOG(1, "INFO: Current line of point " << *point << " is " << *line << ".");
    770771      ConcavityPerLine -= line->CalculateConvexity();
    771772    }
    … …  
    815816
    816817  for (PointMap::const_iterator PointRunner = TesselStruct->PointsOnBoundary.begin(); PointRunner != TesselStruct->PointsOnBoundary.end(); PointRunner++) {
    817     DoeLog(1) && (eLog() << Verbose(1) << "INFO: Current point is " << * PointRunner->second << "." << endl);
     818    ELOG(1, "INFO: Current point is " << * PointRunner->second << ".");
    818819
    819820    distance = 0.;
    … …  
    840841  int counter = 0;
    841842
    842   DoLog(1) && (Log() << Verbose(1) << "Check: List of Baselines with not two connected triangles:" << endl);
     843  LOG(1, "Check: List of Baselines with not two connected triangles:");
    843844  for (testline = TesselStruct->LinesOnBoundary.begin(); testline != TesselStruct->LinesOnBoundary.end(); testline++) {
    844845    if (testline->second->triangles.size() != 2) {
    845       DoLog(2) && (Log() << Verbose(2) << *testline->second << "\t" << testline->second->triangles.size() << endl);
     846      LOG(2, *testline->second << "\t" << testline->second->triangles.size());
    846847      counter++;
    847848    }
    848849  }
    849850  if (counter == 0) {
    850     DoLog(1) && (Log() << Verbose(1) << "None." << endl);
     851    LOG(1, "None.");
    851852    result = true;
    852853  }
    … …  
    863864  // check number of endpoints in *P
    864865  if (P->endpoints.size() != 4) {
    865     DoeLog(1) && (eLog()<< Verbose(1) << "CountTrianglePairContainingPolygon works only on polygons with 4 nodes!" << endl);
     866    ELOG(1, "CountTrianglePairContainingPolygon works only on polygons with 4 nodes!");
    866867    return 0;
    867868  }
    … …  
    869870  // check number of triangles in *T
    870871  if (T->size() < 2) {
    871     DoeLog(1) && (eLog()<< Verbose(1) << "Not enough triangles to have pairs!" << endl);
     872    ELOG(1, "Not enough triangles to have pairs!");
    872873    return 0;
    873874  }
    874875
    875   DoLog(0) && (Log() << Verbose(0) << "Polygon is " << *P << endl);
     876  LOG(0, "Polygon is " << *P);
    876877  // create each pair, get the endpoints and check whether *P is contained.
    877878  int counter = 0;
    … …  
    889890        const int size = PairTrianglenodes.endpoints.size();
    890891        if (size == 4) {
    891           DoLog(0) && (Log() << Verbose(0) << " Current pair of triangles: " << **Walker << "," << **PairWalker << " with " << size << " distinct endpoints:" << PairTrianglenodes << endl);
     892          LOG(0, " Current pair of triangles: " << **Walker << "," << **PairWalker << " with " << size << " distinct endpoints:" << PairTrianglenodes);
    892893          // now check
    893894          if (PairTrianglenodes.ContainsPresentTupel(P)) {
    894895            counter++;
    895             DoLog(0) && (Log() << Verbose(0) << "  ACCEPT: Matches with " << *P << endl);
     896            LOG(0, "  ACCEPT: Matches with " << *P);
    896897          } else {
    897             DoLog(0) && (Log() << Verbose(0) << "  REJECT: No match with " << *P << endl);
     898            LOG(0, "  REJECT: No match with " << *P);
    898899          }
    899900        } else {
    900           DoLog(0) && (Log() << Verbose(0) << "  REJECT: Less than four endpoints." << endl);
     901          LOG(0, "  REJECT: Less than four endpoints.");
    901902        }
    902903      }
    … …  
    919920    if (P2->ContainsBoundaryPoint((*Runner))) {
    920921      counter++;
    921       DoLog(1) && (Log() << Verbose(1) << *(*Runner) << " of second polygon is found in the first one." << endl);
     922      LOG(1, *(*Runner) << " of second polygon is found in the first one.");
    922923      return true;
    923924    }
    … …  
    937938    Tester = P1->endpoints.insert((*Runner));
    938939    if (Tester.second)
    939       DoLog(0) && (Log() << Verbose(0) << "Inserting endpoint " << *(*Runner) << " into first polygon." << endl);
     940      LOG(0, "Inserting endpoint " << *(*Runner) << " into first polygon.");
    940941  }
    941942  P2->endpoints.clear();
Note: See TracChangeset for help on using the changeset viewer.