Changeset 2a3124 for src/Tesselation

Timestamp:

Apr 3, 2012, 8:00:45 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:

ce7bfd

Parents:

e791dc

git-author:

Frederik Heber <heber@…> (03/13/12 17:35:01)

git-committer:

Frederik Heber <heber@…> (04/03/12 08:00:45)

Message:

VERBOSE: Removed lots of Info objects in tesselation classes member functions.

Location:

src/Tesselation

Files:

• BoundaryTriangleSet.cpp (modified) (14 diffs)
• tesselation.cpp (modified) (1 diff)
• triangleintersectionlist.cpp (modified) (9 diffs)

src/Tesselation/BoundaryTriangleSet.cpp

@@ -46 +46 @@
   Nr(-1)
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   for (int i = 0; i < 3; i++) {
     endpoints[i] = NULL;
@@ -61 +61 @@
   Nr(number)
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   // set number
   // set lines
@@ -95 +95 @@
 BoundaryTriangleSet::~BoundaryTriangleSet()
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   for (int i = 0; i < 3; i++) {
     if (lines[i] != NULL) {
@@ -135 +135 @@
 void BoundaryTriangleSet::GetNormalVector(const Vector &OtherVector)
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   // get normal vector
   NormalVector = Plane((endpoints[0]->node->getPosition()),
@@ -163 +163 @@
 bool BoundaryTriangleSet::GetIntersectionInsideTriangle(const Vector & MolCenter, const Vector & x, Vector &Intersection) const
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   Vector CrossPoint;
   Vector helper;
@@ -227 +227 @@
 double BoundaryTriangleSet::GetClosestPointInsideTriangle(const Vector &x, Vector &ClosestPoint) const
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   Vector Direction;
 
@@ -309 +309 @@
 bool BoundaryTriangleSet::ContainsBoundaryLine(const BoundaryLineSet * const line) const
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   for (int i = 0; i < 3; i++)
     if (line == lines[i])
@@ -323 +323 @@
 bool BoundaryTriangleSet::ContainsBoundaryPoint(const BoundaryPointSet * const point) const
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   for (int i = 0; i < 3; i++)
     if (point == endpoints[i])
@@ -337 +337 @@
 bool BoundaryTriangleSet::ContainsBoundaryPoint(const TesselPoint * const point) const
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   for (int i = 0; i < 3; i++)
     if (point == endpoints[i]->node)
@@ -351 +351 @@
 bool BoundaryTriangleSet::IsPresentTupel(const BoundaryPointSet * const Points[3]) const
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   LOG(1, "INFO: Checking " << Points[0] << "," << Points[1] << "," << Points[2] << " against " << endpoints[0] << "," << endpoints[1] << "," << endpoints[2] << ".");
   return (((endpoints[0] == Points[0]) || (endpoints[0] == Points[1]) || (endpoints[0] == Points[2])) && ((endpoints[1] == Points[0]) || (endpoints[1] == Points[1]) || (endpoints[1] == Points[2])) && ((endpoints[2] == Points[0]) || (endpoints[2] == Points[1]) || (endpoints[2] == Points[2])
@@ -365 +365 @@
 bool BoundaryTriangleSet::IsPresentTupel(const BoundaryTriangleSet * const T) const
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   return (((endpoints[0] == T->endpoints[0]) || (endpoints[0] == T->endpoints[1]) || (endpoints[0] == T->endpoints[2])) && ((endpoints[1] == T->endpoints[0]) || (endpoints[1] == T->endpoints[1]) || (endpoints[1] == T->endpoints[2])) && ((endpoints[2] == T->endpoints[0]) || (endpoints[2] == T->endpoints[1]) || (endpoints[2] == T->endpoints[2])
 
@@ -453 +453 @@
 class BoundaryPointSet *BoundaryTriangleSet::GetThirdEndpoint(const BoundaryLineSet * const line) const
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   // sanity check
   if (!ContainsBoundaryLine(line))
@@ -471 +471 @@
 class BoundaryLineSet *BoundaryTriangleSet::GetThirdLine(const BoundaryPointSet * const point) const
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   // sanity check
   if (!ContainsBoundaryPoint(point))
@@ -489 +489 @@
 void BoundaryTriangleSet::GetCenter(Vector & center) const
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   center.Zero();
   for (int i = 0; i < 3; i++)

src/Tesselation/tesselation.cpp

@@ -2571 +2571 @@
 bool Tesselation::IsInnerPoint(const Vector &Point, const LinkedCell_deprecated* const LC) const
 {
-  Info FunctionInfo(__func__);
   TriangleIntersectionList Intersections(Point, this, LC);
-
   return Intersections.IsInside();
 }
-;
 
 /** Returns the distance to the surface given by the tesselation.

src/Tesselation/triangleintersectionlist.cpp

@@ -46 +46 @@
   Vicinity(LC)
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   GatherIntersectionsWithTriangles();
 };
@@ -55 +55 @@
 TriangleIntersectionList::~TriangleIntersectionList()
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   for (TriangleVectorMap::iterator Runner = IntersectionList.begin(); Runner != IntersectionList.end(); Runner++)
     delete((*Runner).second);
@@ -66 +66 @@
 double TriangleIntersectionList::GetSmallestDistance() const
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   FillDistanceList();
   if (!DistanceList.empty())
@@ -81 +81 @@
 Vector TriangleIntersectionList::GetClosestIntersection() const
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   TriangleVectorMap::const_iterator runner;
   runner = GetIteratortoSmallestDistance();
@@ -97 +97 @@
 BoundaryTriangleSet * TriangleIntersectionList::GetClosestTriangle() const
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   TriangleVectorMap::const_iterator runner;
   runner = GetIteratortoSmallestDistance();
@@ -112 +112 @@
 bool TriangleIntersectionList::IsInside() const
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   TriangleVectorMap::const_iterator runner = GetIteratortoSmallestDistance();
   if (runner != IntersectionList.end()) {
@@ -144 +144 @@
 void TriangleIntersectionList::GatherIntersectionsWithTriangles()
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
 
   // get closest points
@@ -174 +174 @@
 void TriangleIntersectionList::FillDistanceList() const
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   if (DistanceList.empty())
     for (TriangleVectorMap::const_iterator runner = IntersectionList.begin(); runner != IntersectionList.end(); runner++)
@@ -190 +190 @@
 TriangleVectorMap::const_iterator TriangleIntersectionList::GetIteratortoSmallestDistance() const
 {
-  Info FunctionInfo(__func__);
+  //Info FunctionInfo(__func__);
   FillDistanceList();