Changeset 418b5e

Timestamp:

Mar 27, 2012, 3:53:36 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:

f6ad4d

Parents:

cc21cd

git-author:

Frederik Heber <heber@…> (03/14/12 16:18:30)

git-committer:

Frederik Heber <heber@…> (03/27/12 15:53:36)

Message:

Added verbosity to some tesselation functions.

• added exception catch to Tesselation::FindStartingTriangle().
• also added verbosity to TriangleIntersectionList::IsInside().

Location:

src/Tesselation

Files:

• tesselation.cpp (modified) (4 diffs)
• triangleintersectionlist.cpp (modified) (2 diffs)

src/Tesselation/tesselation.cpp

@@ -1161 +1161 @@
     BaseLine = new BoundaryLineSet();
     BaseLine->endpoints[0] = new BoundaryPointSet(MaxPoint[k]);
-    LOG(0, "Coordinates of start node at " << *BaseLine->endpoints[0]->node << ".");
+    LOG(0, "INFO: Coordinates of start node at " << *BaseLine->endpoints[0]->node << ".");
 
     double ShortestAngle;
@@ -1174 +1174 @@
     }
     BaseLine->endpoints[1] = new BoundaryPointSet(Temporary);
+    LOG(1, "INFO: Second node is at " << *Temporary << ".");
 
     // construct center of circle
     CircleCenter = 0.5 * ((BaseLine->endpoints[0]->node->getPosition()) + (BaseLine->endpoints[1]->node->getPosition()));
+    LOG(1, "INFO: CircleCenter is at " << CircleCenter << ".");
 
     // construct normal vector of circle
     CirclePlaneNormal = (BaseLine->endpoints[0]->node->getPosition()) - (BaseLine->endpoints[1]->node->getPosition());
+    LOG(1, "INFO: CirclePlaneNormal is at " << CirclePlaneNormal << ".");
 
     double radius = CirclePlaneNormal.NormSquared();
@@ -1186 +1189 @@
     NormalVector.ProjectOntoPlane(CirclePlaneNormal);
     NormalVector.Normalize();
+    LOG(1, "INFO: NormalVector is at " << NormalVector << ".");
     ShortestAngle = 2. * M_PI; // This will indicate the quadrant.
 
@@ -1192 +1196 @@
 
     // look in one direction of baseline for initial candidate
-    SearchDirection = Plane(CirclePlaneNormal, NormalVector,0).getNormal();  // whether we look "left" first or "right" first is not important ...
+    try {
+      SearchDirection = Plane(CirclePlaneNormal, NormalVector,0).getNormal();  // whether we look "left" first or "right" first is not important ...
+    } catch(LinearAlgebraException) {
+      ELOG(1, "Vectors are linear dependent: "
+          << CirclePlaneNormal << ", " << NormalVector << ".");
+      delete BaseLine;
+      continue;
+    }
 
     // adding point 1 and point 2 and add the line between them

src/Tesselation/triangleintersectionlist.cpp

@@ -113 +113 @@
 {
   Info FunctionInfo(__func__);
-  TriangleVectorMap::const_iterator runner;
-  runner = GetIteratortoSmallestDistance();
+  TriangleVectorMap::const_iterator runner = GetIteratortoSmallestDistance();
   if (runner != IntersectionList.end()) {
     // if we have found one, check Scalarproduct between the vector
     Vector TestVector = (Point) - (*(*runner).second);
-    if (fabs(TestVector.NormSquared()) < MYEPSILON) //
+    LOG(1, "INFO: Distance vector between point " << Point
+        << " and triangle intersection at " << (*(*runner).second) << " is "
+        << TestVector << ".");
+    if (fabs(TestVector.NormSquared()) < MYEPSILON)  {//
+      LOG(1, "ACCEPT: Point is on the intersected triangle.");
       return true;
+    }
     const double sign = (*runner).first->NormalVector.ScalarProduct(TestVector);
+    LOG(1, "INFO: Checking sign of SKP between Distance vector and triangle's NormalVector "
+        << (*runner).first->NormalVector << ": " << sign << ".");
     if (sign < 0) {
+      LOG(1, "ACCEPT: Point lies on inner side of intersected triangle.");
       return true;
     } else {
+      LOG(1, "REJECT: Point lies on outer side of intersected triangle.");
       return false;
     }
@@ -186 +194 @@
 
   // do we have any intersections?
-  TriangleVectorMap::const_iterator runner;
+  TriangleVectorMap::const_iterator runner = IntersectionList.end();
   if (!DistanceList.empty()) {
     // get closest triangle(s)