Changeset ce7bfd for src/Tesselation/BoundaryPolygonSet.cpp

Timestamp:

Apr 4, 2012, 11:30:11 AM (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:

03a589

Parents:

2a3124

git-author:

Frederik Heber <heber@…> (03/13/12 19:35:15)

git-committer:

Frederik Heber <heber@…> (04/04/12 11:30:11)

Message:

VERBOSE: Subsequent change in verbosity levels of many tesselation functions after Info removal.

File:

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

src/Tesselation/BoundaryPolygonSet.cpp

@@ -44 +44 @@
   Nr(-1)
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
 }
 ;
@@ -54 +54 @@
 BoundaryPolygonSet::~BoundaryPolygonSet()
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   endpoints.clear();
-  LOG(1, "Erasing polygon Nr." << Nr << " itself.");
+  LOG(5, "DEBUG: Erasing polygon Nr." << Nr << " itself.");
 }
 ;
@@ -67 +67 @@
 Vector * BoundaryPolygonSet::GetNormalVector(const Vector &OtherVector) const
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   // get normal vector
   Vector TemporaryNormal;
@@ -97 +97 @@
   if (TotalNormal->ScalarProduct(OtherVector) > 0.)
     TotalNormal->Scale(-1.);
-  LOG(1, "Normal Vector is " << *TotalNormal << ".");
+  LOG(4, "DEBUG: Normal Vector is " << *TotalNormal << ".");
 
   return TotalNormal;
@@ -109 +109 @@
 void BoundaryPolygonSet::GetCenter(Vector * const center) const
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   center->Zero();
   int counter = 0;
@@ -117 +117 @@
   }
   center->Scale(1. / (double) counter);
-  LOG(1, "Center is at " << *center << ".");
+  LOG(4, "DEBUG: Center of BoundaryPolygonSet is at " << *center << ".");
 }
 
@@ -126 +126 @@
 bool BoundaryPolygonSet::ContainsBoundaryTriangle(const BoundaryTriangleSet * const triangle) const
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   return ContainsPresentTupel(triangle->endpoints, 3);
 }
@@ -137 +137 @@
 bool BoundaryPolygonSet::ContainsBoundaryLine(const BoundaryLineSet * const line) const
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   return ContainsPresentTupel(line->endpoints, 2);
 }
@@ -148 +148 @@
 bool BoundaryPolygonSet::ContainsBoundaryPoint(const BoundaryPointSet * const point) const
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   for (PointSet::const_iterator Runner = endpoints.begin(); Runner != endpoints.end(); Runner++) {
-    LOG(0, "Checking against " << **Runner);
     if (point == (*Runner)) {
-      LOG(0, " Contained.");
+      LOG(4, "DEBUG: Checking against " << **Runner << ": Contained.");
       return true;
     }
   }
-  LOG(0, " Not contained.");
   return false;
 }
@@ -167 +165 @@
 bool BoundaryPolygonSet::ContainsBoundaryPoint(const TesselPoint * const point) const
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   for (PointSet::const_iterator Runner = endpoints.begin(); Runner != endpoints.end(); Runner++)
     if (point == (*Runner)->node) {
-      LOG(0, " Contained.");
+      LOG(4, "DEBUG: Checking against " << **Runner << ": Contained.");
       return true;
     }
-  LOG(0, " Not contained.");
   return false;
 }
@@ -185 +182 @@
 bool BoundaryPolygonSet::ContainsPresentTupel(const BoundaryPointSet * const * Points, const int dim) const
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   int counter = 0;
-  LOG(1, "Polygon is " << *this);
+  LOG(5, "DEBUG Polygon is " << *this);
   for (int i = 0; i < dim; i++) {
-    LOG(1, " Testing endpoint " << *Points[i]);
+    LOG(5, "DEBUG: Testing endpoint " << *Points[i]);
     if (ContainsBoundaryPoint(Points[i])) {
       counter++;
@@ -208 +205 @@
 bool BoundaryPolygonSet::ContainsPresentTupel(const PointSet &endpoints) const
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   size_t counter = 0;
-  LOG(1, "Polygon is " << *this);
+  LOG(5, "DEBUG: Polygon is " << *this);
   for (PointSet::const_iterator Runner = endpoints.begin(); Runner != endpoints.end(); Runner++) {
-    LOG(1, " Testing endpoint " << **Runner);
+    LOG(5, "DEBUG:  Testing endpoint " << **Runner);
     if (ContainsBoundaryPoint(*Runner))
       counter++;
@@ -239 +236 @@
 TriangleSet * BoundaryPolygonSet::GetAllContainedTrianglesFromEndpoints() const
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   pair<TriangleSet::iterator, bool> Tester;
   TriangleSet *triangles = new TriangleSet;
@@ -250 +247 @@
           Tester = triangles->insert(Sprinter->second);
           if (Tester.second)
-            LOG(0, "Adding triangle " << *(Sprinter->second));
+            LOG(4, "DEBUG: Adding triangle " << *(Sprinter->second));
         }
       }
 
-  LOG(1, "The Polygon of " << endpoints.size() << " endpoints has " << triangles->size() << " unique triangles in total.");
+  LOG(3, "DEBUG: The Polygon of " << endpoints.size() << " endpoints has " << triangles->size() << " unique triangles in total.");
   return triangles;
 }
@@ -265 +262 @@
 bool BoundaryPolygonSet::FillPolygonFromTrianglesOfLine(const BoundaryLineSet * const line)
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   pair<PointSet::iterator, bool> Tester;
   if (line == NULL)
     return false;
-  LOG(1, "Filling polygon from line " << *line);
+  LOG(3, "DEBUG: 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)
-        LOG(1, "  Inserting endpoint " << *((Runner->second)->endpoints[i]));
+        LOG(4, "DEBUG:   Inserting endpoint " << *((Runner->second)->endpoints[i]));
     }
   }