Changeset 368207 for src/Tesselation/triangleintersectionlist.cpp

Timestamp:

Mar 28, 2012, 12:10:52 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:

471dec

Parents:

53bc04

git-author:

Frederik Heber <heber@…> (03/14/12 17:53:59)

git-committer:

Frederik Heber <heber@…> (03/28/12 12:10:52)

Message:

FIX: Incorporated special case affecting TriangleIntersectionList::IsInside().

• If the closest points happens to be a TesselPoint of the boundary, all of its triangle's SKPs with the intersection-point vector have to be checked. As the point is only inside, if all of them are negative.
• TriangleIntersectionList DistannceList is now a multimap, to allow for multiple triangles at the same distance.
• Now TriangleIntersectionList::GetIteratortoSmallestDistance() goes through all entries at the same smallest distance and returns the first whose SKP is positive, otherwise the first.
• TESTFIX: This fixes failing Tesselation_InsideOutsideUnitTest, hence removed it from XFAIL_TESTs.

File:

• src/Tesselation/triangleintersectionlist.cpp (modified) (1 diff)

src/Tesselation/triangleintersectionlist.cpp

@@ -197 +197 @@
   if (!DistanceList.empty()) {
     // get closest triangle(s)
-    std::pair< DistanceTriangleMap::iterator, DistanceTriangleMap::iterator >  DistanceRange =
+    std::pair< DistanceTriangleMap::const_iterator, DistanceTriangleMap::const_iterator >  DistanceRange =
         DistanceList.equal_range(DistanceList.begin()->first);
+    {
+      size_t count = 0;
+      for (DistanceTriangleMap::const_iterator iter = DistanceRange.first;
+          iter != DistanceRange.second; ++iter)
+        ++count;
+      LOG(1, "INFO: There are " << count << " possible triangles at the smallest distance.");
+    }
     // if there is more than one, check all of their normal vectors
-    // return the one with positive SKP if present
-
-    runner = IntersectionList.find(DistanceList.begin()->second);
+    // return the one with positive SKP if present because if the point
+    // would be truely inside, all of the closest triangles would have to show
+    // their inner side
+    LOG(1, "INFO: Looking for first SKP greater than zero ...");
+    for (DistanceTriangleMap::const_iterator iter = DistanceRange.first;
+        iter != DistanceRange.second; ++iter) {
+      // find the entry by the triangle key in IntersectionList to get the Intersection point
+      runner = IntersectionList.find(iter->second);
+      Vector TestVector = (Point) - (*(*runner).second);
+      // construct SKP
+      const double sign = (*iter).second->NormalVector.ScalarProduct(TestVector);
+      LOG(1, "INFO: Checking SKP of closest triangle " << *(iter->second) << " = " << sign << ".");
+      // if positive return
+      if (sign > 0)
+        break;
+    }
+    // if there's just one or all are negative, runner is not set yet
+    if (runner == IntersectionList.end())
+      runner = IntersectionList.find(DistanceList.begin()->second);
   }
   return runner;