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

Bugfix entering nodes of TM2 when traversing it.

This commit is contained in:
Martin Skrodzki 2019-07-19 11:07:06 +02:00
parent 98e92a973b
commit 130dcbc158
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/AABB_traversal_traits_with_Hausdorff_distance.h
View File

@ -146,8 +146,15 @@ namespace CGAL {
squared_distance(tri_center, v2)
));
// If triangles in the node can still lower the upper bound, enter it
if (tri_radius + bb_radius >= dist) {
// Find a lower bound on the distance of the triangle to the bounding box
// by taking the distance from the triangle center to the bbox center
// and subtracting the radii of both elements. Thereby, each triangle in
// the bounding box has at least distance
// ( dist - triangle_radius - bbox_radius )
// to the query triangle. Only if this lower bound is lower than the
// current best known lower bound, we enter the node, trying to
// lower the lower bound further.
if ( (dist - tri_radius - bb_radius) <= h_local_lower) {
return true;
} else {
return false;
@ -230,10 +237,7 @@ namespace CGAL {
// Update global Hausdorff bounds according to the obtained local bounds
Hausdorff_bounds local_bounds = traversal_traits_tm2.get_local_bounds();
/*
std::cout << "Processed triangle " << primitive.id() << " with bounds ("
<< local_bounds.first << ", " << local_bounds.second << ")" << std::endl;
*/
if (local_bounds.first > h_lower) {
h_lower = local_bounds.first;
}

4
Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_distance.cpp
View File

@ -290,7 +290,7 @@ int main(int, char** argv)
time.stop();
std::cout << "done in " << time.time() << "s.\n";
#endif
/*
time.reset();
time.start();
std::cout << "Hausdorff distance approximation between meshes (sequential) "
@ -309,7 +309,7 @@ int main(int, char** argv)
<< "\n";
time.stop();
std::cout << "done in " << time.time() << "s.\n";
*/
time.reset();
time.start();
std::cout << "Bounded Hausdorff distance between meshes (sequential), optimized implementation "