diff --git a/Spatial_sorting/test/Spatial_sorting/test_hilbert.cpp b/Spatial_sorting/test/Spatial_sorting/test_hilbert.cpp index bc33af3e569..a5ca80472f0 100644 --- a/Spatial_sorting/test/Spatial_sorting/test_hilbert.cpp +++ b/Spatial_sorting/test/Spatial_sorting/test_hilbert.cpp @@ -16,8 +16,7 @@ #include #include - -#include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef K::Point_2 Point_2; @@ -32,10 +31,10 @@ typedef CGAL::Creator_uniform_d::iterator, Point>Creator_d; int main () { - int nb_points_2 = 5000, nb_points_3 = 5000, + int nb_points_2 = 10000, nb_points_3 = 10000, nb_points_d=10000, small_nb_points_d=3; CGAL::Random random (42); - CGAL::Timer cost; + CGAL::Real_timer timer; std::cout << "Testing Hilbert sort." << std::endl; @@ -57,19 +56,19 @@ int main () std::cout << " Sorting points... " << std::flush; - cost.reset();cost.start(); + timer.reset();timer.start(); CGAL::hilbert_sort (v.begin(), v.end()); - cost.stop(); + timer.stop(); - std::cout << "done in "<(v2.begin(), v2.end()); - cost.stop(); + timer.stop(); - std::cout << "done in " << cost.time() << "seconds." << std::endl; + std::cout << "done in " << timer.time() << "seconds." << std::endl; std::cout << " Checking... " << std::flush; assert(v == v2); @@ -90,11 +89,11 @@ int main () std::cout << " Sorting points... " << std::flush; - cost.reset();cost.start(); + timer.reset();timer.start(); CGAL::hilbert_sort (v.begin(), v.end()); - cost.stop(); + timer.stop(); - std::cout << "done in "<(v2.begin(), v2.end()); - cost.stop(); + timer.stop(); - std::cout << "done in " << cost.time() << "seconds." << std::endl; + std::cout << "done in " << timer.time() << "seconds." << std::endl; std::cout << " Checking... " << std::flush; assert(v == v2); @@ -218,11 +217,11 @@ int main () std::cout << " Sorting points... " << std::flush; - cost.reset();cost.start(); + timer.reset();timer.start(); CGAL::hilbert_sort (v.begin(), v.end()); - cost.stop(); + timer.stop(); - std::cout << "done in "<(v2.begin(), v2.end()); - cost.stop(); + timer.stop(); - std::cout << "done in " << cost.time() << "seconds." << std::endl; + std::cout << "done in " << timer.time() << "seconds." << std::endl; std::cout << " Checking... " << std::flush; assert(v == v2); @@ -349,11 +348,11 @@ int main () std::cout << " Sorting points... " << std::flush; - cost.reset();cost.start(); + timer.reset();timer.start(); CGAL::hilbert_sort_on_sphere(v.begin(),v.end(), 4, CGAL::ORIGIN + Vector_3(3,5,5)); - cost.stop(); + timer.stop(); - std::cout << "done in "<