From db7dfd97e51e9ea5417660122fc26b7408506e50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Thu, 21 Jul 2022 10:20:20 +0200 Subject: [PATCH] get rid of the GeomTraits template parameter --- .../region_growing_circles_on_point_set_2.cpp | 12 ++++++------ .../Region_growing/Point_set/K_neighbor_query.h | 10 +++++----- .../Point_set/Least_squares_circle_fit_region.h | 10 +++++----- .../Point_set/Least_squares_circle_fit_sorting.h | 10 +++++----- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Shape_detection/examples/Shape_detection/region_growing_circles_on_point_set_2.cpp b/Shape_detection/examples/Shape_detection/region_growing_circles_on_point_set_2.cpp index 443b32d13b0..8298d1c7051 100644 --- a/Shape_detection/examples/Shape_detection/region_growing_circles_on_point_set_2.cpp +++ b/Shape_detection/examples/Shape_detection/region_growing_circles_on_point_set_2.cpp @@ -21,9 +21,9 @@ using Point_set_3 = CGAL::Point_set_3; using Point_map = Point_set_2::Point_map; using Normal_map = Point_set_2::Vector_map; -using Neighbor_query = CGAL::Shape_detection::Point_set::K_neighbor_query_for_point_set; -using Region_type = CGAL::Shape_detection::Point_set::Least_squares_circle_fit_region_for_point_set; -using Sorting = CGAL::Shape_detection::Point_set::Least_squares_circle_fit_sorting_for_point_set; +using Neighbor_query = CGAL::Shape_detection::Point_set::K_neighbor_query_for_point_set; +using Region_type = CGAL::Shape_detection::Point_set::Least_squares_circle_fit_region_for_point_set; +using Sorting = CGAL::Shape_detection::Point_set::Least_squares_circle_fit_sorting_for_point_set; using Region_growing = CGAL::Shape_detection::Region_growing; int main(int argc, char** argv) { @@ -63,10 +63,10 @@ int main(int argc, char** argv) { const std::size_t min_region_size = 20; // Create instances of the classes Neighbor_query and Region_type. - Neighbor_query neighbor_query = CGAL::Shape_detection::Point_set::make_k_neighbor_query( + Neighbor_query neighbor_query = CGAL::Shape_detection::Point_set::make_k_neighbor_query( point_set_2); - Region_type region_type = CGAL::Shape_detection::Point_set::make_least_squares_circle_fit_region( + Region_type region_type = CGAL::Shape_detection::Point_set::make_least_squares_circle_fit_region( point_set_2, CGAL::parameters:: maximum_distance(max_distance). @@ -74,7 +74,7 @@ int main(int argc, char** argv) { minimum_region_size(min_region_size)); // Sort indices. - Sorting sorting = CGAL::Shape_detection::Point_set::make_least_squares_circle_fit_sorting( + Sorting sorting = CGAL::Shape_detection::Point_set::make_least_squares_circle_fit_sorting( point_set_2, neighbor_query, CGAL::parameters::k_neighbors(k)); sorting.sort(); diff --git a/Shape_detection/include/CGAL/Shape_detection/Region_growing/Point_set/K_neighbor_query.h b/Shape_detection/include/CGAL/Shape_detection/Region_growing/Point_set/K_neighbor_query.h index f8bbba3e011..e212b04fdeb 100644 --- a/Shape_detection/include/CGAL/Shape_detection/Region_growing/Point_set/K_neighbor_query.h +++ b/Shape_detection/include/CGAL/Shape_detection/Region_growing/Point_set/K_neighbor_query.h @@ -208,9 +208,9 @@ namespace Point_set { shortcut to ease the definition of the class when using `CGAL::Point_set_3`. To be used together with `make_least_squares_sphere_fit_sorting_for_point_set()`. */ - template + template using K_neighbor_query_for_point_set = - K_neighbor_query::Kernel, typename PointSet3::Index, typename PointSet3::Point_map>; @@ -218,11 +218,11 @@ namespace Point_set { \ingroup PkgShapeDetectionRGOnPoints returns a instance of the sorting class to be used with `CGAL::Point_set_3`, with point and normal maps added to `np`. */ - template - K_neighbor_query_for_point_set + template + K_neighbor_query_for_point_set make_k_neighbor_query(const PointSet3& ps, CGAL_NP_CLASS np = parameters::default_values()) { - return K_neighbor_query_for_point_set( + return K_neighbor_query_for_point_set( ps, np.point_map(ps.point_map())); } diff --git a/Shape_detection/include/CGAL/Shape_detection/Region_growing/Point_set/Least_squares_circle_fit_region.h b/Shape_detection/include/CGAL/Shape_detection/Region_growing/Point_set/Least_squares_circle_fit_region.h index e64552a5a88..d42b5b0459a 100644 --- a/Shape_detection/include/CGAL/Shape_detection/Region_growing/Point_set/Least_squares_circle_fit_region.h +++ b/Shape_detection/include/CGAL/Shape_detection/Region_growing/Point_set/Least_squares_circle_fit_region.h @@ -385,9 +385,9 @@ namespace Point_set { shortcut to ease the definition of the class when using `CGAL::Point_set_3`. To be used together with `make_least_squares_sphere_fit_sorting_for_point_set()`. */ - template + template using Least_squares_circle_fit_region_for_point_set = - Least_squares_circle_fit_region::Kernel, typename PointSet3::Index, typename PointSet3::Point_map, typename PointSet3::Vector_map>; @@ -396,11 +396,11 @@ namespace Point_set { \ingroup PkgShapeDetectionRGOnPoints returns a instance of the sorting class to be used with `CGAL::Point_set_3`, with point and normal maps added to `np`. */ - template - Least_squares_circle_fit_region_for_point_set + template + Least_squares_circle_fit_region_for_point_set make_least_squares_circle_fit_region(const PointSet3& ps, CGAL_NP_CLASS np = parameters::default_values()) { - return Least_squares_circle_fit_region_for_point_set( + return Least_squares_circle_fit_region_for_point_set( np.point_map(ps.point_map()).normal_map(ps.normal_map())); } diff --git a/Shape_detection/include/CGAL/Shape_detection/Region_growing/Point_set/Least_squares_circle_fit_sorting.h b/Shape_detection/include/CGAL/Shape_detection/Region_growing/Point_set/Least_squares_circle_fit_sorting.h index 93c4cf5b676..d842d37072a 100644 --- a/Shape_detection/include/CGAL/Shape_detection/Region_growing/Point_set/Least_squares_circle_fit_sorting.h +++ b/Shape_detection/include/CGAL/Shape_detection/Region_growing/Point_set/Least_squares_circle_fit_sorting.h @@ -216,9 +216,9 @@ namespace Point_set { shortcut to ease the definition of the class when using `CGAL::Point_set_3`. To be used together with `make_least_squares_circle_fit_sorting()`. */ - template + template using Least_squares_circle_fit_sorting_for_point_set = - Least_squares_circle_fit_sorting::Kernel, typename PointSet3::Index, NeighborQuery, typename PointSet3::Point_map>; @@ -227,11 +227,11 @@ namespace Point_set { \ingroup PkgShapeDetectionRGOnPoints returns a instance of the sorting class to be used with `CGAL::Point_set_3`, with point and normal maps added to `np`. */ - template - Least_squares_circle_fit_sorting_for_point_set + template + Least_squares_circle_fit_sorting_for_point_set make_least_squares_circle_fit_sorting(const PointSet3& ps, NeighborQuery& neighbor_query, const CGAL_NP_CLASS np = parameters::default_values()) { - return Least_squares_circle_fit_sorting_for_point_set + return Least_squares_circle_fit_sorting_for_point_set (ps, neighbor_query, np.point_map(ps.point_map())); }