diff --git a/Spatial_searching/test/Spatial_searching/Iso_rectangle_2_query.cpp b/Spatial_searching/test/Spatial_searching/Iso_rectangle_2_query.cpp index 1261dc3dc36..562e249ba57 100644 --- a/Spatial_searching/test/Spatial_searching/Iso_rectangle_2_query.cpp +++ b/Spatial_searching/test/Spatial_searching/Iso_rectangle_2_query.cpp @@ -39,27 +39,27 @@ void run(std::list all_points) Point q(0.3, 0.5); typename SearchTraits::Point_d pp(p); typename SearchTraits::Point_d qq(q); - - - Iso_rectangle exact_ic(p,q); - Fuzzy_box exact_range(pp,qq); + + Iso_rectangle ic(p,q); + + Fuzzy_box default_range(pp,qq); std::list result; - // Searching the box r exactly - tree.search( std::back_inserter( result ), exact_range); - + // Searching the box ic + tree.search( std::back_inserter( result ), default_range); + tree.search(CGAL::Emptyset_iterator(), Fuzzy_box(p,q) ); //test compilation when Point != Traits::Point_d - - // test the results of the exact query + + // test the results of the default query std::list copy_all_points(all_points); for (typename std::list::iterator pt=result.begin(); (pt != result.end()); ++pt) { - assert(! exact_ic.has_on_unbounded_side(get_point(*pt)) || exact_ic.has_on_boundary(get_point(*pt))); + assert(! ic.has_on_unbounded_side(get_point(*pt)) || ic.has_on_boundary(get_point(*pt))); copy_all_points.remove(get_point(*pt)); } for (std::list::iterator pt=copy_all_points.begin(); (pt != copy_all_points.end()); ++pt) { - assert(exact_ic.has_on_unbounded_side(*pt) || exact_ic.has_on_boundary(*pt)); + assert(ic.has_on_unbounded_side(*pt) || ic.has_on_boundary(*pt)); } diff --git a/Spatial_searching/test/Spatial_searching/Range_searching.cpp b/Spatial_searching/test/Spatial_searching/Range_searching.cpp index 938b5b9d70e..3afb2c02ee0 100644 --- a/Spatial_searching/test/Spatial_searching/Range_searching.cpp +++ b/Spatial_searching/test/Spatial_searching/Range_searching.cpp @@ -48,22 +48,22 @@ void run(std::list all_points) std::list result; // Searching the box r exactly tree.search( std::back_inserter( result ), exact_range); - + // test the results of the exact query std::list copy_all_points(all_points); - + for (typename std::list::iterator pt=result.begin(); (pt != result.end()); ++pt) { assert(! exact_ic.has_on_unbounded_side(get_point(*pt))); copy_all_points.remove(get_point(*pt)); } - + for (std::list::iterator pt=copy_all_points.begin(); (pt != copy_all_points.end()); ++pt) { assert(exact_ic.has_on_unbounded_side(*pt)); } result.clear(); - // approximate range searching using value 0.1 for fuzziness parameter + // approximate range searching using value 0.05 for fuzziness parameter Fuzzy_box approximate_range(pp,qq,0.05); Iso_cuboid inner_ic(p+ 0.05*Vector(1,1,1),q-0.05*Vector(1,1,1)); Iso_cuboid outer_ic(p- 0.05*Vector(1,1,1),q+0.05*Vector(1,1,1)); diff --git a/Spatial_searching/test/Spatial_searching/iso_rectangle_2_query_2.cpp b/Spatial_searching/test/Spatial_searching/iso_rectangle_2_query_2.cpp index 17193f40023..4a1acbec9a0 100644 --- a/Spatial_searching/test/Spatial_searching/iso_rectangle_2_query_2.cpp +++ b/Spatial_searching/test/Spatial_searching/iso_rectangle_2_query_2.cpp @@ -24,8 +24,7 @@ main() { Tree tree; Random_points_iterator rpg; - //inserting N points one-by-one, thus the use of "reserve" is recommended, and thus we use it - + //inserting N points one-by-one, thus the use of "reserve" is recommended, and we use it tree.reserve(N); //to test wether the tree.capacity() function works properly. @@ -47,7 +46,7 @@ main() { Point_d q(0.7, 0.7); // Searching an exact range - // using default value 0.0 for epsilon fuzziness paramater + // using default value 0.0 for epsilon fuzziness parameter // Fuzzy_box exact_range(r); replaced by Fuzzy_iso_box exact_range(p,q); std::cout << "tree.search(..)" << std::endl;