diff --git a/Triangulation/benchmark/Triangulation/Td_vs_T2_and_T3.cpp b/Triangulation/benchmark/Triangulation/Td_vs_T2_and_T3.cpp index 111aeb191b6..cb237ddd643 100644 --- a/Triangulation/benchmark/Triangulation/Td_vs_T2_and_T3.cpp +++ b/Triangulation/benchmark/Triangulation/Td_vs_T2_and_T3.cpp @@ -6,10 +6,6 @@ #include #include -#include -#include -#include -#include #include #include @@ -135,14 +131,14 @@ void go(const int N) { std::array pt; for (int j = 0; j < D; ++j) - pt[j] = CGAL::default_random.get_double(-1., 1.); + pt[j] = CGAL::get_default_random().get_double(-1., 1.); coords.push_back(pt); } // Generate weights std::vector weights; weights.reserve(N); for (int i = 0; i < N; ++i) - weights.push_back(CGAL::default_random.get_double(-10., 10.)); + weights.push_back(CGAL::get_default_random().get_double(-10., 10.)); // DTd typedef CGAL::Epick_d Kd; @@ -156,15 +152,15 @@ void go(const int N) // RTd typedef CGAL::Regular_triangulation RT_d; - typedef typename RT_d::Bare_point Bare_point_d; - typedef typename RT_d::Point WPoint_d; + //typedef typename RT_d::Point Bare_point_d; // because of Regular_traits_adapter Point is actually a Weighted_point + typedef typename RT_d::Weighted_point WPoint_d; std::vector wpoints_d; wpoints_d.reserve(N); for (int i = 0; i < N; ++i) { wpoints_d.push_back(WPoint_d( - Bare_point_d(D, coords[i].begin(), coords[i].end()), + Point_d(D, coords[i].begin(), coords[i].end()), weights[i])); } @@ -186,8 +182,7 @@ void go(const int N) test(D, N, points_d, points, "static"); // Regular - typedef CGAL::Regular_triangulation_filtered_traits_2 Traits_2; - typedef CGAL::Regular_triangulation_2 RT_2; + typedef CGAL::Regular_triangulation_2 RT_2; typedef typename RT_2::Bare_point Bare_point; typedef typename RT_2::Point WPoint; @@ -219,8 +214,7 @@ void go(const int N) test(D, N, points_d, points, "static"); // Regular - typedef CGAL::Regular_triangulation_filtered_traits_3 Traits_3; - typedef CGAL::Regular_triangulation_3 RT_3; + typedef CGAL::Regular_triangulation_3 RT_3; typedef typename RT_3::Bare_point Bare_point; typedef typename RT_3::Point WPoint;