Changeset 47d041 for src/Tesselation/BoundaryPolygonSet.cpp

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:

• src/Tesselation/BoundaryPolygonSet.cpp (modified) (10 diffs)

src/Tesselation/BoundaryPolygonSet.cpp

@@ -56 +56 @@
   Info FunctionInfo(__func__);
   endpoints.clear();
-  DoLog(1) && (Log() << Verbose(1) << "Erasing polygon Nr." << Nr << " itself." << endl);
+  LOG(1, "Erasing polygon Nr." << Nr << " itself.");
 }
 ;
@@ -77 +77 @@
       Runner[i]++;
       if (Runner[i] == endpoints.end()) {
-        DoeLog(0) && (eLog() << Verbose(0) << "There are less than three endpoints in the polygon!" << endl);
+        ELOG(0, "There are less than three endpoints in the polygon!");
         performCriticalExit();
       }
@@ -97 +97 @@
   if (TotalNormal->ScalarProduct(OtherVector) > 0.)
     TotalNormal->Scale(-1.);
-  DoLog(1) && (Log() << Verbose(1) << "Normal Vector is " << *TotalNormal << "." << endl);
+  LOG(1, "Normal Vector is " << *TotalNormal << ".");
 
   return TotalNormal;
@@ -117 +117 @@
   }
   center->Scale(1. / (double) counter);
-  DoLog(1) && (Log() << Verbose(1) << "Center is at " << *center << "." << endl);
+  LOG(1, "Center is at " << *center << ".");
 }
 
@@ -150 +150 @@
   Info FunctionInfo(__func__);
   for (PointSet::const_iterator Runner = endpoints.begin(); Runner != endpoints.end(); Runner++) {
-    DoLog(0) && (Log() << Verbose(0) << "Checking against " << **Runner << endl);
+    LOG(0, "Checking against " << **Runner);
     if (point == (*Runner)) {
-      DoLog(0) && (Log() << Verbose(0) << " Contained." << endl);
+      LOG(0, " Contained.");
       return true;
     }
   }
-  DoLog(0) && (Log() << Verbose(0) << " Not contained." << endl);
+  LOG(0, " Not contained.");
   return false;
 }
@@ -170 +170 @@
   for (PointSet::const_iterator Runner = endpoints.begin(); Runner != endpoints.end(); Runner++)
     if (point == (*Runner)->node) {
-      DoLog(0) && (Log() << Verbose(0) << " Contained." << endl);
+      LOG(0, " Contained.");
       return true;
     }
-  DoLog(0) && (Log() << Verbose(0) << " Not contained." << endl);
+  LOG(0, " Not contained.");
   return false;
 }
@@ -187 +187 @@
   Info FunctionInfo(__func__);
   int counter = 0;
-  DoLog(1) && (Log() << Verbose(1) << "Polygon is " << *this << endl);
+  LOG(1, "Polygon is " << *this);
   for (int i = 0; i < dim; i++) {
-    DoLog(1) && (Log() << Verbose(1) << " Testing endpoint " << *Points[i] << endl);
+    LOG(1, " Testing endpoint " << *Points[i]);
     if (ContainsBoundaryPoint(Points[i])) {
       counter++;
@@ -210 +210 @@
   Info FunctionInfo(__func__);
   size_t counter = 0;
-  DoLog(1) && (Log() << Verbose(1) << "Polygon is " << *this << endl);
+  LOG(1, "Polygon is " << *this);
   for (PointSet::const_iterator Runner = endpoints.begin(); Runner != endpoints.end(); Runner++) {
-    DoLog(1) && (Log() << Verbose(1) << " Testing endpoint " << **Runner << endl);
+    LOG(1, " Testing endpoint " << **Runner);
     if (ContainsBoundaryPoint(*Runner))
       counter++;
@@ -246 +246 @@
     for (LineMap::const_iterator Walker = (*Runner)->lines.begin(); Walker != (*Runner)->lines.end(); Walker++)
       for (TriangleMap::const_iterator Sprinter = (Walker->second)->triangles.begin(); Sprinter != (Walker->second)->triangles.end(); Sprinter++) {
-        //Log() << Verbose(0) << " Testing triangle " << *(Sprinter->second) << endl;
+        //LOG(0, " Testing triangle " << *(Sprinter->second));
         if (ContainsBoundaryTriangle(Sprinter->second)) {
           Tester = triangles->insert(Sprinter->second);
           if (Tester.second)
-            DoLog(0) && (Log() << Verbose(0) << "Adding triangle " << *(Sprinter->second) << endl);
+            LOG(0, "Adding triangle " << *(Sprinter->second));
         }
       }
 
-  DoLog(1) && (Log() << Verbose(1) << "The Polygon of " << endpoints.size() << " endpoints has " << triangles->size() << " unique triangles in total." << endl);
+  LOG(1, "The Polygon of " << endpoints.size() << " endpoints has " << triangles->size() << " unique triangles in total.");
   return triangles;
 }
@@ -269 +269 @@
   if (line == NULL)
     return false;
-  DoLog(1) && (Log() << Verbose(1) << "Filling polygon from line " << *line << endl);
+  LOG(1, "Filling polygon from line " << *line);
   for (TriangleMap::const_iterator Runner = line->triangles.begin(); Runner != line->triangles.end(); Runner++) {
     for (int i = 0; i < 3; i++) {
       Tester = endpoints.insert((Runner->second)->endpoints[i]);
       if (Tester.second)
-        DoLog(1) && (Log() << Verbose(1) << "  Inserting endpoint " << *((Runner->second)->endpoints[i]) << endl);
+        LOG(1, "  Inserting endpoint " << *((Runner->second)->endpoints[i]));
     }
   }