songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix traversal order, add comment on benchmark results.

This commit is contained in:
Martin Skrodzki 2019-10-14 00:28:08 +02:00
parent 6e73f92fd2
commit 16e0a475f4
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
AABB_tree/include/CGAL/internal/AABB_tree/AABB_node.h
View File

@ -240,22 +240,29 @@ AABB_node<Tr>::traversal_with_priority(const Query& query,
{ {
if (iright) if (iright)
{ {
// Both children have to be inspected
if(pleft >= pright) if(pleft >= pright)
{ {
// Inspect left first, has higher priority
left_child().traversal_with_priority(query, traits, nb_primitives/2); left_child().traversal_with_priority(query, traits, nb_primitives/2);
if( traits.go_further() /* && traits.do_intersect(query, right_child()) */ ) // TODO shall we call again do_intersect? if( traits.go_further() ) //&& traits.do_intersect(query, right_child()) ) // TODO shall we call again do_intersect? (Benchmarks show it slows down the Hausdorff Distance)
right_child().traversal_with_priority(query, traits, nb_primitives-nb_primitives/2); right_child().traversal_with_priority(query, traits, nb_primitives-nb_primitives/2);
} }
else else
{ {
// Inspect right first, has higher priority
right_child().traversal_with_priority(query, traits, nb_primitives-nb_primitives/2); right_child().traversal_with_priority(query, traits, nb_primitives-nb_primitives/2);
if( traits.go_further() /* && traits.do_intersect(query, left_child()) */ ) // TODO shall we call again do_intersect? if( traits.go_further() ) //&& traits.do_intersect(query, left_child()) ) // TODO shall we call again do_intersect? (Benchmarks show it slows down the Hausdorff Distance)
left_child().traversal_with_priority(query, traits, nb_primitives/2); left_child().traversal_with_priority(query, traits, nb_primitives/2);
} }
} }
else
// Only the left child has to be inspected
left_child().traversal_with_priority(query, traits, nb_primitives/2);
} }
else else
if (iright) if (iright)
// Only the right child has to be inspected
right_child().traversal_with_priority(query, traits, nb_primitives-nb_primitives/2); right_child().traversal_with_priority(query, traits, nb_primitives-nb_primitives/2);
} }
} }