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

Do not use an inner approx if 'eps > r'

This commit is contained in:
Mael Rouxel-Labbé 2018-04-19 14:16:12 +02:00
parent 15d925710e
commit 6897cdea85
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Spatial_searching/include/CGAL/Fuzzy_sphere.h
View File

@ -62,7 +62,7 @@ public:
CGAL_precondition(r >= 0);
CGAL_precondition(eps >= 0);
sq_inner_radius = (eps > r) ? 0 : (r - eps) * (r - eps);
sq_inner_radius = (eps > r) ? -1. : (r - eps) * (r - eps);
sq_outer_radius = (r + eps) * (r + eps);
}

21
Spatial_searching/test/Spatial_searching/Circular_query.cpp
View File

@ -50,8 +50,8 @@ void run_with_fuzziness(std::list<Point> all_points, // intentional copy
std::cout << "test with center: " << center << " radius: " << radius << " eps: " << fuzziness << "... ";
const FT inner_radius = (fuzziness > radius) ? 0 : (radius - fuzziness);
const FT sq_inner_radius = inner_radius * inner_radius;
const FT inner_radius = radius - fuzziness;
const FT sq_inner_radius = (inner_radius < 0) ? -1 : inner_radius * inner_radius;
const FT outer_radius = radius + fuzziness;
const FT sq_outer_radius = outer_radius * outer_radius;
@ -106,14 +106,19 @@ void run_with_fuzziness(std::list<Point> all_points, // intentional copy
all_points.remove(get_point(*pt));
}
for(std::list<Point>::const_iterator pt=all_points.begin(); (pt != all_points.end()); ++pt)
// note: if eps > r, the squared radius is set to '-1'. We cannot have missed
// any point because there is no inner approximation.
if(sq_inner_radius >= 0.)
{
// all points with a distance d <= r - eps must have been reported
bool is_correct = (CGAL::squared_distance(center,*pt) > sq_inner_radius);
if(!is_correct)
std::cout << "missed " << *pt << " with distance = " << CGAL::squared_distance(center,*pt) << std::endl;
for(std::list<Point>::const_iterator pt=all_points.begin(); (pt != all_points.end()); ++pt)
{
// all points with a distance d <= r - eps must have been reported
bool is_correct = (CGAL::squared_distance(center,*pt) > sq_inner_radius);
if(!is_correct)
std::cout << "missed " << *pt << " with distance = " << CGAL::squared_distance(center,*pt) << std::endl;
assert(is_correct);
assert(is_correct);
}
}
std::cout << "done" << std::endl;