Changeset b8d215 for src/Tesselation/triangleintersectionlist.cpp
- Timestamp:
- Oct 19, 2014, 5:13:10 PM (10 years ago)
- 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:
- 6d5280
- Parents:
- dfe054
- git-author:
- Frederik Heber <heber@…> (09/25/14 18:26:03)
- git-committer:
- Frederik Heber <heber@…> (10/19/14 17:13:10)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/Tesselation/triangleintersectionlist.cpp
rdfe054 rb8d215 132 132 // if we have found one, check Scalarproduct between the vector 133 133 Vector TestVector = (Point) - (*(*runner).second); 134 LOG( 1, "INFO: Distance vector between point " << Point134 LOG(4, "DEBUG: Distance vector between point " << Point 135 135 << " and triangle intersection at " << (*(*runner).second) << " is " 136 136 << TestVector << "."); 137 137 if (fabs(TestVector.NormSquared()) < MYEPSILON) {// 138 LOG( 1, "ACCEPT: Point is on the intersected triangle.");138 LOG(3, "ACCEPT: Point is on the intersected triangle."); 139 139 return true; 140 140 } 141 141 const double sign = (*runner).first->NormalVector.ScalarProduct(TestVector); 142 LOG( 1, "INFO: Checking sign of SKP between Distance vector and triangle's NormalVector "142 LOG(4, "DEBUG: Checking sign of SKP between Distance vector and triangle's NormalVector " 143 143 << (*runner).first->NormalVector << ": " << sign << "."); 144 144 if (sign < 0) { 145 LOG( 1, "ACCEPT: Point lies on inner side of intersected triangle.");145 LOG(3, "ACCEPT: Point lies on inner side of intersected triangle."); 146 146 return true; 147 147 } else { 148 LOG( 1, "REJECT: Point lies on outer side of intersected triangle.");148 LOG(3, "REJECT: Point lies on outer side of intersected triangle."); 149 149 return false; 150 150 } … … 224 224 for (DistanceTriangleMap::const_iterator iter = DistanceRange.first; 225 225 iter != DistanceRange.second; ++iter) { 226 LOG( 3, "DEBUG: " << *(iter->second) << " is in the list with " << iter->first << ".");226 LOG(4, "DEBUG: " << *(iter->second) << " is in the list with " << iter->first << "."); 227 227 ++count; 228 228 } 229 LOG( 1, "INFO: There are " << count << " possible triangles at the smallest distance.");229 LOG(3, "INFO: There are " << count << " possible triangles at the smallest distance."); 230 230 } 231 231 // if there is more than one, check all of their normal vectors … … 233 233 // would be truely inside, all of the closest triangles would have to show 234 234 // their inner side 235 LOG( 1, "INFO: Looking for first SKP greater than zero ...");235 LOG(4, "DEBUG: Looking for first SKP greater than zero ..."); 236 236 for (DistanceTriangleMap::const_iterator iter = DistanceRange.first; 237 237 iter != DistanceRange.second; ++iter) { … … 241 241 // construct SKP 242 242 const double sign = (*iter).second->NormalVector.ScalarProduct(TestVector); 243 LOG( 1, "INFO: Checking SKP of closest triangle " << *(iter->second) << " = " << sign << ".");243 LOG(4, "DEBUG: Checking SKP of closest triangle " << *(iter->second) << " = " << sign << "."); 244 244 // if positive return 245 245 if (sign > 0)
Note:
See TracChangeset
for help on using the changeset viewer.