From b88deb37591451ccddc8823c092c35a71cc9ecc8 Mon Sep 17 00:00:00 2001 From: Simon Giraudot Date: Fri, 5 May 2017 14:19:34 +0200 Subject: [PATCH] Rename Efficient_RANSAC_traits as Shape_detection_traits (same for concept) --- .../reconstruction_structured.cpp | 2 +- .../modules/list_of_documented_headers.cmake | 2 +- .../examples/Point_set_3/point_set_algo.cpp | 2 +- .../structuring_example.cpp | 2 +- .../include/CGAL/structure_point_set.h | 4 +- .../structuring_test.cpp | 2 +- ...tRANSACTraits.h => ShapeDetectionTraits.h} | 4 +- .../PackageDescription.txt | 4 +- .../Point_set_shape_detection_3.txt | 2 +- .../efficient_RANSAC_basic.cpp | 4 +- .../efficient_RANSAC_custom_shape.cpp | 4 +- .../efficient_RANSAC_parameters.cpp | 4 +- .../efficient_RANSAC_point_access.cpp | 4 +- .../plane_regularization.cpp | 2 +- .../include/CGAL/Shape_detection_3.h | 2 +- ...NSAC_traits.h => Shape_detection_traits.h} | 12 ++--- .../include/CGAL/regularize_planes.h | 48 +++++++++---------- ...Efficient_RANSAC_fake_traits_for_testing.h | 6 +-- .../test_cone_connected_component.cpp | 2 +- .../test_cone_parameters.cpp | 2 +- .../test_cylinder_connected_component.cpp | 2 +- .../test_cylinder_parameters.cpp | 2 +- .../test_plane_connected_component.cpp | 2 +- .../test_plane_parameters.cpp | 2 +- .../test_regularization.cpp | 2 +- .../test_scene.cpp | 2 +- .../test_sphere_connected_component.cpp | 2 +- .../test_sphere_parameters.cpp | 2 +- .../test_torus_connected_component.cpp | 2 +- .../test_torus_parameters.cpp | 2 +- .../Point_set_shape_detection_plugin.cpp | 4 +- .../Surface_reconstruction_plugin.cpp | 2 +- 32 files changed, 70 insertions(+), 70 deletions(-) rename Point_set_shape_detection_3/doc/Point_set_shape_detection_3/Concepts/{EfficientRANSACTraits.h => ShapeDetectionTraits.h} (99%) rename Point_set_shape_detection_3/include/CGAL/Shape_detection_3/{Efficient_RANSAC_traits.h => Shape_detection_traits.h} (95%) diff --git a/Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/reconstruction_structured.cpp b/Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/reconstruction_structured.cpp index 7c9242dcdbc..fb88eea6eb5 100644 --- a/Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/reconstruction_structured.cpp +++ b/Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/reconstruction_structured.cpp @@ -21,7 +21,7 @@ typedef CGAL::First_of_pair_property_map Point_map; typedef CGAL::Second_of_pair_property_map Normal_map; // Efficient RANSAC types -typedef CGAL::Shape_detection_3::Efficient_RANSAC_traits +typedef CGAL::Shape_detection_3::Shape_detection_traits Traits; typedef CGAL::Shape_detection_3::Efficient_RANSAC Efficient_ransac; typedef CGAL::Shape_detection_3::Plane Plane; diff --git a/Installation/cmake/modules/list_of_documented_headers.cmake b/Installation/cmake/modules/list_of_documented_headers.cmake index 260f173447c..f1947ec799d 100644 --- a/Installation/cmake/modules/list_of_documented_headers.cmake +++ b/Installation/cmake/modules/list_of_documented_headers.cmake @@ -753,7 +753,7 @@ CGAL/Segment_tree_k.h CGAL/Shape_detection_3/Cone.h CGAL/Shape_detection_3/Cylinder.h CGAL/Shape_detection_3/Efficient_RANSAC.h -CGAL/Shape_detection_3/Efficient_RANSAC_traits.h +CGAL/Shape_detection_3/Shape_detection_traits.h CGAL/Shape_detection_3.h CGAL/Shape_detection_3/Plane.h CGAL/Shape_detection_3/Shape_base.h diff --git a/Point_set_3/examples/Point_set_3/point_set_algo.cpp b/Point_set_3/examples/Point_set_3/point_set_algo.cpp index e37789dd0ff..f8b6b77351f 100644 --- a/Point_set_3/examples/Point_set_3/point_set_algo.cpp +++ b/Point_set_3/examples/Point_set_3/point_set_algo.cpp @@ -18,7 +18,7 @@ typedef CGAL::Random_points_on_sphere_3 Point_generator; typedef CGAL::Point_set_3 Point_set; -typedef CGAL::Shape_detection_3::Efficient_RANSAC_traits +typedef CGAL::Shape_detection_3::Shape_detection_traits Traits; typedef CGAL::Shape_detection_3::Efficient_RANSAC Efficient_ransac; typedef CGAL::Shape_detection_3::Sphere Sphere; diff --git a/Point_set_processing_3/examples/Point_set_processing_3/structuring_example.cpp b/Point_set_processing_3/examples/Point_set_processing_3/structuring_example.cpp index 4e49bd7c31e..8bb950f7211 100644 --- a/Point_set_processing_3/examples/Point_set_processing_3/structuring_example.cpp +++ b/Point_set_processing_3/examples/Point_set_processing_3/structuring_example.cpp @@ -20,7 +20,7 @@ typedef CGAL::First_of_pair_property_map Point_map; typedef CGAL::Second_of_pair_property_map Normal_map; // Efficient RANSAC types -typedef CGAL::Shape_detection_3::Efficient_RANSAC_traits +typedef CGAL::Shape_detection_3::Shape_detection_traits Traits; typedef CGAL::Shape_detection_3::Efficient_RANSAC Efficient_ransac; typedef CGAL::Shape_detection_3::Plane Plane; diff --git a/Point_set_processing_3/include/CGAL/structure_point_set.h b/Point_set_processing_3/include/CGAL/structure_point_set.h index 50601d53195..02790ec4449 100644 --- a/Point_set_processing_3/include/CGAL/structure_point_set.h +++ b/Point_set_processing_3/include/CGAL/structure_point_set.h @@ -58,7 +58,7 @@ set. Each output point is assigned to one, two or more primitives (depending wether it belongs to a planar section, an edge or a if it is a vertex). The implementation follow \cgalCite{cgal:la-srpss-13}. -\tparam Traits a model of `EfficientRANSACTraits` that must provide in +\tparam Traits a model of `ShapeDetectionTraits` that must provide in addition a function `Intersect_3 intersection_3_object() const` and a functor `Intersect_3` with: - `boost::optional< boost::variant< Traits::Plane_3, Traits::Line_3 > > operator()(typename Traits::Plane_3, typename Traits::Plane_3)` @@ -1457,7 +1457,7 @@ private: /// /// For more details, please refer to \cgalCite{cgal:la-srpss-13}. /// -/// @tparam Traits a model of `EfficientRANSACTraits` that must provide in +/// @tparam Traits a model of `ShapeDetectionTraits` that must provide in /// addition a function `Intersect_3 intersection_3_object() const` and a /// functor `Intersect_3` with: /// - `boost::optional< boost::variant< Traits::Plane_3, Traits::Line_3 > > operator()(typename Traits::Plane_3, typename Traits::Plane_3)` diff --git a/Point_set_processing_3/test/Point_set_processing_3/structuring_test.cpp b/Point_set_processing_3/test/Point_set_processing_3/structuring_test.cpp index 683a286995c..01e86933d9c 100644 --- a/Point_set_processing_3/test/Point_set_processing_3/structuring_test.cpp +++ b/Point_set_processing_3/test/Point_set_processing_3/structuring_test.cpp @@ -19,7 +19,7 @@ typedef std::vector Pwn_vector; typedef CGAL::First_of_pair_property_map Point_map; typedef CGAL::Second_of_pair_property_map Normal_map; -typedef CGAL::Shape_detection_3::Efficient_RANSAC_traits +typedef CGAL::Shape_detection_3::Shape_detection_traits Traits; typedef CGAL::Shape_detection_3::Efficient_RANSAC Efficient_ransac; diff --git a/Point_set_shape_detection_3/doc/Point_set_shape_detection_3/Concepts/EfficientRANSACTraits.h b/Point_set_shape_detection_3/doc/Point_set_shape_detection_3/Concepts/ShapeDetectionTraits.h similarity index 99% rename from Point_set_shape_detection_3/doc/Point_set_shape_detection_3/Concepts/EfficientRANSACTraits.h rename to Point_set_shape_detection_3/doc/Point_set_shape_detection_3/Concepts/ShapeDetectionTraits.h index b032b6f13db..44db0198c28 100644 --- a/Point_set_shape_detection_3/doc/Point_set_shape_detection_3/Concepts/EfficientRANSACTraits.h +++ b/Point_set_shape_detection_3/doc/Point_set_shape_detection_3/Concepts/ShapeDetectionTraits.h @@ -11,10 +11,10 @@ input data has to be provided in form of a random access iterator. Point and normal property maps have to be provided to extract the points and the normals from the input. -\cgalHasModel `CGAL::Shape_detection_3::Efficient_RANSAC_traits` +\cgalHasModel `CGAL::Shape_detection_3::Shape_detection_traits` */ -class EfficientRANSACTraits{ +class ShapeDetectionTraits{ public: /// \name Types diff --git a/Point_set_shape_detection_3/doc/Point_set_shape_detection_3/PackageDescription.txt b/Point_set_shape_detection_3/doc/Point_set_shape_detection_3/PackageDescription.txt index 4e277fb44c6..c261db2fe62 100644 --- a/Point_set_shape_detection_3/doc/Point_set_shape_detection_3/PackageDescription.txt +++ b/Point_set_shape_detection_3/doc/Point_set_shape_detection_3/PackageDescription.txt @@ -32,11 +32,11 @@ \cgalClassifedRefPages ## Concept ## -- `EfficientRANSACTraits` +- `ShapeDetectionTraits` ## Main Classes ## +- `CGAL::Shape_detection_3::Shape_dection_traits` - `CGAL::Shape_detection_3::Efficient_RANSAC` -- `CGAL::Shape_detection_3::Efficient_RANSAC_traits` ## Shape Interface ## - `CGAL::Shape_detection_3::Shape_base` diff --git a/Point_set_shape_detection_3/doc/Point_set_shape_detection_3/Point_set_shape_detection_3.txt b/Point_set_shape_detection_3/doc/Point_set_shape_detection_3/Point_set_shape_detection_3.txt index ff7dd453444..fee2e334b76 100644 --- a/Point_set_shape_detection_3/doc/Point_set_shape_detection_3/Point_set_shape_detection_3.txt +++ b/Point_set_shape_detection_3/doc/Point_set_shape_detection_3/Point_set_shape_detection_3.txt @@ -49,7 +49,7 @@ This parameter defines the probability to miss the largest candidate shape. A lo This minimum number of points controls the termination of the algorithm. The shape search is iterated until no further shapes can be found with a higher support. Note that this parameter is not strict: depending on the chosen probability, shapes may be extracted with a number of points lower than the specified parameter. \section Point_set_shape_detection_3Usage Examples -The main class `Shape_detection_3::Efficient_RANSAC` takes a template parameter `Shape_detection_3::Efficient_RANSAC_traits` that defines the geometric types and input format. Property maps provide a means to interface with user-specific data structures. The first parameter of the `Shape_detection_3::Efficient_RANSAC_traits` class is the common Kernel. In order to match the constraints of property maps, an iterator type and two maps that map an iterator to a point and a normal are specified in the `Shape_detection_3::Efficient_RANSAC_traits` class. The concept behind property maps is detailed in \ref chapterProperty_map "a dedicated chapter". +The main class `Shape_detection_3::Efficient_RANSAC` takes a template parameter `Shape_detection_3::Shape_detection_traits` that defines the geometric types and input format. Property maps provide a means to interface with user-specific data structures. The first parameter of the `Shape_detection_3::Shape_detection_traits` class is the common Kernel. In order to match the constraints of property maps, an iterator type and two maps that map an iterator to a point and a normal are specified in the `Shape_detection_3::Shape_detection_traits` class. The concept behind property maps is detailed in \ref chapterProperty_map "a dedicated chapter". Typical usage consists in five steps: diff --git a/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_basic.cpp b/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_basic.cpp index 5bb32729971..2529d47b53e 100644 --- a/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_basic.cpp +++ b/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_basic.cpp @@ -15,9 +15,9 @@ typedef std::vector Pwn_vector; typedef CGAL::First_of_pair_property_map Point_map; typedef CGAL::Second_of_pair_property_map Normal_map; -// In Efficient_RANSAC_traits the basic types, i.e., Point and Vector types +// In Shape_detection_traits the basic types, i.e., Point and Vector types // as well as iterator type and property maps, are defined. -typedef CGAL::Shape_detection_3::Efficient_RANSAC_traits +typedef CGAL::Shape_detection_3::Shape_detection_traits Traits; typedef CGAL::Shape_detection_3::Efficient_RANSAC Efficient_ransac; typedef CGAL::Shape_detection_3::Plane Plane; diff --git a/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_custom_shape.cpp b/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_custom_shape.cpp index d7c2dd00117..8ac8c0e60b2 100644 --- a/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_custom_shape.cpp +++ b/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_custom_shape.cpp @@ -16,9 +16,9 @@ typedef std::vector Pwn_vector; typedef CGAL::First_of_pair_property_map Point_map; typedef CGAL::Second_of_pair_property_map Normal_map; -// In Efficient_RANSAC_traits the basic types, i.e., Point and Vector types +// In Shape_detection_traits the basic types, i.e., Point and Vector types // as well as iterator type and property maps, are defined. -typedef CGAL::Shape_detection_3::Efficient_RANSAC_traits +typedef CGAL::Shape_detection_3::Shape_detection_traits Traits; typedef CGAL::Shape_detection_3::Efficient_RANSAC Efficient_ransac; typedef My_Plane Plane; diff --git a/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_parameters.cpp b/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_parameters.cpp index 9bea6706909..77b1e0e8fd2 100644 --- a/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_parameters.cpp +++ b/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_parameters.cpp @@ -17,9 +17,9 @@ typedef std::vector Pwn_vector; typedef CGAL::First_of_pair_property_map Point_map; typedef CGAL::Second_of_pair_property_map Normal_map; -// In Efficient_RANSAC_traits the basic types, i.e., Point and Vector types +// In Shape_detection_traits the basic types, i.e., Point and Vector types // as well as iterator type and property maps, are defined. -typedef CGAL::Shape_detection_3::Efficient_RANSAC_traits Traits; typedef CGAL::Shape_detection_3::Efficient_RANSAC Efficient_ransac; typedef CGAL::Shape_detection_3::Cone Cone; diff --git a/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_point_access.cpp b/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_point_access.cpp index 126ad3f4dd0..2bcdacb65ba 100644 --- a/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_point_access.cpp +++ b/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_point_access.cpp @@ -18,9 +18,9 @@ typedef std::vector Pwn_vector; typedef CGAL::First_of_pair_property_map Point_map; typedef CGAL::Second_of_pair_property_map Normal_map; -// In Efficient_RANSAC_traits the basic types, i.e., Point and Vector types +// In Shape_detection_traits the basic types, i.e., Point and Vector types // as well as iterator type and property maps, are defined. -typedef CGAL::Shape_detection_3::Efficient_RANSAC_traits Traits; typedef CGAL::Shape_detection_3::Efficient_RANSAC Efficient_ransac; typedef CGAL::Shape_detection_3::Plane Plane; diff --git a/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/plane_regularization.cpp b/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/plane_regularization.cpp index 239b6e8670a..b8307edaae5 100644 --- a/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/plane_regularization.cpp +++ b/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/plane_regularization.cpp @@ -15,7 +15,7 @@ typedef std::vector Pwn_vector; typedef CGAL::First_of_pair_property_map Point_map; typedef CGAL::Second_of_pair_property_map Normal_map; -typedef CGAL::Shape_detection_3::Efficient_RANSAC_traits +typedef CGAL::Shape_detection_3::Shape_detection_traits Traits; typedef CGAL::Shape_detection_3::Efficient_RANSAC Efficient_ransac; typedef CGAL::Shape_detection_3::Plane Plane; diff --git a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3.h b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3.h index 80d55742e26..da92f707520 100644 --- a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3.h +++ b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3.h @@ -33,7 +33,7 @@ #include -#include +#include #include #include #include diff --git a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Efficient_RANSAC_traits.h b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Shape_detection_traits.h similarity index 95% rename from Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Efficient_RANSAC_traits.h rename to Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Shape_detection_traits.h index 5bb55bd6d88..12b9d956d72 100644 --- a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Efficient_RANSAC_traits.h +++ b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Shape_detection_traits.h @@ -19,8 +19,8 @@ // Author(s) : Sven Oesau, Yannick Verdie, Clément Jamin, Pierre Alliez // -#ifndef CGAL_SHAPE_DETECTION_3_EFFICIENT_RANSAC_TRAITS_H -#define CGAL_SHAPE_DETECTION_3_EFFICIENT_RANSAC_TRAITS_H +#ifndef CGAL_SHAPE_DETECTION_3_SHAPE_DETECTION_TRAITS_H +#define CGAL_SHAPE_DETECTION_3_SHAPE_DETECTION_TRAITS_H #include @@ -32,7 +32,7 @@ namespace CGAL { /*! \ingroup PkgPointSetShapeDetection3 \brief %Default traits class to use the shape detection class `Efficient_RANSAC`. - \cgalModels `EfficientRANSACTraits` + \cgalModels `Shape_detection_3::Traits` \tparam Gt a model of the concept `#Kernel` with `Gt::FT` being `float` or `double`. @@ -48,7 +48,7 @@ namespace CGAL { class InputRange, class InputPointMap, class InputNormalMap> - struct Efficient_RANSAC_traits { + struct Shape_detection_traits { /// typedef typename Gt::FT FT; /// @@ -78,7 +78,7 @@ namespace CGAL { /// typedef CGAL::Search_traits_3 Search_traits; /// - Efficient_RANSAC_traits(const Gt& gt = Gt()) + Shape_detection_traits(const Gt& gt = Gt()) : m_gt(gt) {} typedef typename Gt::Construct_point_3 Construct_point_3; @@ -193,4 +193,4 @@ namespace CGAL { } } // end of namespace CGAL::Shape_detection_3 -#endif // CGAL_SHAPE_DETECTION_3_EFFICIENT_RANSAC_TRAITS_H +#endif // CGAL_SHAPE_DETECTION_3_SHAPE_DETECTION_TRAITS_H diff --git a/Point_set_shape_detection_3/include/CGAL/regularize_planes.h b/Point_set_shape_detection_3/include/CGAL/regularize_planes.h index 677e793e968..0a5f42cc35d 100644 --- a/Point_set_shape_detection_3/include/CGAL/regularize_planes.h +++ b/Point_set_shape_detection_3/include/CGAL/regularize_planes.h @@ -548,7 +548,7 @@ void subgraph_mutually_orthogonal_clusters (PlaneClusterContainer& clusters, The implementation follows \cgalCite{cgal:vla-lod-15}. - \tparam Traits a model of `EfficientRANSACTraits` + \tparam Traits a model of `ShapeDetectionTraits` \param shape_detection Shape detection object used to detect shapes from the input data. While the shape detection algorithm @@ -583,34 +583,34 @@ void subgraph_mutually_orthogonal_clusters (PlaneClusterContainer& clusters, regularization. Default value is the Z axis. */ -template -void regularize_planes (const Shape_detection_3::Efficient_RANSAC& shape_detection, +template +void regularize_planes (const Shape_detection_3::Efficient_RANSAC& shape_detection, bool regularize_parallelism, bool regularize_orthogonality, bool regularize_coplanarity, bool regularize_axis_symmetry, - typename EfficientRANSACTraits::FT tolerance_angle - = (typename EfficientRANSACTraits::FT)25.0, - typename EfficientRANSACTraits::FT tolerance_coplanarity - = (typename EfficientRANSACTraits::FT)0.01, - typename EfficientRANSACTraits::Vector_3 symmetry_direction - = typename EfficientRANSACTraits::Vector_3 - ((typename EfficientRANSACTraits::FT)0., - (typename EfficientRANSACTraits::FT)0., - (typename EfficientRANSACTraits::FT)1.)) + typename ShapeDetectionTraits::FT tolerance_angle + = (typename ShapeDetectionTraits::FT)25.0, + typename ShapeDetectionTraits::FT tolerance_coplanarity + = (typename ShapeDetectionTraits::FT)0.01, + typename ShapeDetectionTraits::Vector_3 symmetry_direction + = typename ShapeDetectionTraits::Vector_3 + ((typename ShapeDetectionTraits::FT)0., + (typename ShapeDetectionTraits::FT)0., + (typename ShapeDetectionTraits::FT)1.)) { - typedef typename EfficientRANSACTraits::FT FT; - typedef typename EfficientRANSACTraits::Point_3 Point; - typedef typename EfficientRANSACTraits::Vector_3 Vector; - typedef typename EfficientRANSACTraits::Plane_3 Plane; + typedef typename ShapeDetectionTraits::FT FT; + typedef typename ShapeDetectionTraits::Point_3 Point; + typedef typename ShapeDetectionTraits::Vector_3 Vector; + typedef typename ShapeDetectionTraits::Plane_3 Plane; - typedef Shape_detection_3::Shape_base Shape; - typedef Shape_detection_3::Plane Plane_shape; + typedef Shape_detection_3::Shape_base Shape; + typedef Shape_detection_3::Plane Plane_shape; - typedef typename internal::PlaneRegularization::Plane_cluster + typedef typename internal::PlaneRegularization::Plane_cluster Plane_cluster; - typename EfficientRANSACTraits::Input_range::iterator input_begin = shape_detection.input_iterator_first(); + typename ShapeDetectionTraits::Input_range::iterator input_begin = shape_detection.input_iterator_first(); std::vector > planes; @@ -631,7 +631,7 @@ void regularize_planes (const Shape_detection_3::Efficient_RANSAC centroids; std::vector areas; - internal::PlaneRegularization::compute_centroids_and_areas + internal::PlaneRegularization::compute_centroids_and_areas (input_begin, planes, shape_detection.point_map(), centroids, areas); tolerance_angle = tolerance_angle * (FT)CGAL_PI / (FT)(180); @@ -642,7 +642,7 @@ void regularize_planes (const Shape_detection_3::Efficient_RANSAC clusters; - internal::PlaneRegularization::compute_parallel_clusters + internal::PlaneRegularization::compute_parallel_clusters (planes, clusters, areas, (regularize_parallelism ? tolerance_cosangle : (FT)0.0), (regularize_axis_symmetry ? symmetry_direction : CGAL::NULL_VECTOR)); @@ -668,7 +668,7 @@ void regularize_planes (const Shape_detection_3::Efficient_RANSAC + internal::PlaneRegularization::cluster_symmetric_cosangles (clusters, tolerance_cosangle, tolerance_cosangle_ortho); } @@ -676,7 +676,7 @@ void regularize_planes (const Shape_detection_3::Efficient_RANSAC + internal::PlaneRegularization::subgraph_mutually_orthogonal_clusters (clusters, (regularize_axis_symmetry ? symmetry_direction : CGAL::NULL_VECTOR)); //recompute optimal plane for each primitive after normal regularization diff --git a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/Efficient_RANSAC_fake_traits_for_testing.h b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/Efficient_RANSAC_fake_traits_for_testing.h index 91f16af323b..a70b26dec4c 100644 --- a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/Efficient_RANSAC_fake_traits_for_testing.h +++ b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/Efficient_RANSAC_fake_traits_for_testing.h @@ -45,9 +45,9 @@ namespace CGAL { class InputRange, class InputPointMap, class InputNormalMap> - struct Efficient_RANSAC_traits { + struct Shape_detection_traits { - typedef Efficient_RANSAC_traits< + typedef Shape_detection_traits< Gt, InputRange, InputPointMap, InputNormalMap> Self; /// typedef double FT; @@ -305,7 +305,7 @@ namespace CGAL { Compute_squared_distance_3 compute_squared_distance_3_object() const { return Compute_squared_distance_3(); }*/ /// - Efficient_RANSAC_traits(const Gt& gt = Gt()) + Shape_detection_traits(const Gt& gt = Gt()) : m_gt(gt) {} private: diff --git a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_cone_connected_component.cpp b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_cone_connected_component.cpp index a696f29d20e..28a6b66c89e 100644 --- a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_cone_connected_component.cpp +++ b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_cone_connected_component.cpp @@ -21,7 +21,7 @@ bool test_cone_connected_component() { typedef CGAL::Identity_property_map Point_map; typedef CGAL::Normal_of_point_with_normal_pmap Normal_map; - typedef CGAL::Shape_detection_3::Efficient_RANSAC_traits< + typedef CGAL::Shape_detection_3::Shape_detection_traits< K, Pwn_vector, Point_map, Normal_map> Traits; typedef CGAL::Shape_detection_3::Efficient_RANSAC Efficient_ransac; diff --git a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_cone_parameters.cpp b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_cone_parameters.cpp index 181aa09e457..9017f8a2d63 100644 --- a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_cone_parameters.cpp +++ b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_cone_parameters.cpp @@ -22,7 +22,7 @@ bool test_cone_parameters() { typedef CGAL::Identity_property_map Point_map; typedef CGAL::Normal_of_point_with_normal_pmap Normal_map; - typedef CGAL::Shape_detection_3::Efficient_RANSAC_traits< + typedef CGAL::Shape_detection_3::Shape_detection_traits< K, Pwn_vector, Point_map, Normal_map> Traits; typedef CGAL::Shape_detection_3::Efficient_RANSAC Efficient_ransac; diff --git a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_cylinder_connected_component.cpp b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_cylinder_connected_component.cpp index eb0d17fa9fc..7f4080a72ae 100644 --- a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_cylinder_connected_component.cpp +++ b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_cylinder_connected_component.cpp @@ -21,7 +21,7 @@ bool test_cylinder_connected_component() { typedef typename CGAL::Identity_property_map Point_map; typedef typename CGAL::Normal_of_point_with_normal_pmap Normal_map; - typedef CGAL::Shape_detection_3::Efficient_RANSAC_traits< + typedef CGAL::Shape_detection_3::Shape_detection_traits< K, Pwn_vector, Point_map, Normal_map> Traits; typedef CGAL::Shape_detection_3::Efficient_RANSAC Efficient_ransac; diff --git a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_cylinder_parameters.cpp b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_cylinder_parameters.cpp index b1c7709281e..2c25167e173 100644 --- a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_cylinder_parameters.cpp +++ b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_cylinder_parameters.cpp @@ -22,7 +22,7 @@ bool test_cylinder_parameters() { typedef CGAL::Identity_property_map Point_map; typedef CGAL::Normal_of_point_with_normal_pmap Normal_map; - typedef CGAL::Shape_detection_3::Efficient_RANSAC_traits< + typedef CGAL::Shape_detection_3::Shape_detection_traits< K, Pwn_vector, Point_map, Normal_map> Traits; typedef CGAL::Shape_detection_3::Efficient_RANSAC Efficient_ransac; diff --git a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_plane_connected_component.cpp b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_plane_connected_component.cpp index 0338cfcf355..2dfe3c17bad 100644 --- a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_plane_connected_component.cpp +++ b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_plane_connected_component.cpp @@ -20,7 +20,7 @@ bool test_plane_connected_component() { typedef CGAL::Identity_property_map Point_map; typedef CGAL::Normal_of_point_with_normal_pmap Normal_map; - typedef typename CGAL::Shape_detection_3::Efficient_RANSAC_traits Traits; typedef typename CGAL::Shape_detection_3::Efficient_RANSAC diff --git a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_plane_parameters.cpp b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_plane_parameters.cpp index d430234fc83..1d8ab16572b 100644 --- a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_plane_parameters.cpp +++ b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_plane_parameters.cpp @@ -20,7 +20,7 @@ bool test_plane_parameters() { typedef typename CGAL::Identity_property_map Point_map; typedef typename CGAL::Normal_of_point_with_normal_pmap Normal_map; - typedef CGAL::Shape_detection_3::Efficient_RANSAC_traits Traits; typedef CGAL::Shape_detection_3::Efficient_RANSAC Efficient_ransac; diff --git a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_regularization.cpp b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_regularization.cpp index be7879b1dfa..1e1cc39bdd3 100644 --- a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_regularization.cpp +++ b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_regularization.cpp @@ -19,7 +19,7 @@ typedef std::vector Pwn_vector; typedef CGAL::First_of_pair_property_map Point_map; typedef CGAL::Second_of_pair_property_map Normal_map; -typedef CGAL::Shape_detection_3::Efficient_RANSAC_traits +typedef CGAL::Shape_detection_3::Shape_detection_traits Traits; typedef CGAL::Shape_detection_3::Efficient_RANSAC Efficient_ransac; diff --git a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_scene.cpp b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_scene.cpp index 2b130773389..b68753dd059 100644 --- a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_scene.cpp +++ b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_scene.cpp @@ -18,7 +18,7 @@ bool test_scene() { typedef CGAL::Identity_property_map Point_map; typedef CGAL::Normal_of_point_with_normal_pmap Normal_map; - typedef CGAL::Shape_detection_3::Efficient_RANSAC_traits< + typedef CGAL::Shape_detection_3::Shape_detection_traits< K, Pwn_vector, Point_map, Normal_map> Traits; typedef CGAL::Shape_detection_3::Efficient_RANSAC diff --git a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_sphere_connected_component.cpp b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_sphere_connected_component.cpp index ead73e05eae..6893efad7ca 100644 --- a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_sphere_connected_component.cpp +++ b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_sphere_connected_component.cpp @@ -20,7 +20,7 @@ bool test_sphere_connected_component() { typedef CGAL::Identity_property_map Point_map; typedef CGAL::Normal_of_point_with_normal_pmap Normal_map; - typedef CGAL::Shape_detection_3::Efficient_RANSAC_traits< + typedef CGAL::Shape_detection_3::Shape_detection_traits< K, Pwn_vector, Point_map, Normal_map> Traits; typedef CGAL::Shape_detection_3::Efficient_RANSAC Efficient_ransac; diff --git a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_sphere_parameters.cpp b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_sphere_parameters.cpp index 3dd37a6698a..b958cbcaf8c 100644 --- a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_sphere_parameters.cpp +++ b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_sphere_parameters.cpp @@ -21,7 +21,7 @@ bool test_sphere_parameters() { typedef CGAL::Identity_property_map Point_map; typedef CGAL::Normal_of_point_with_normal_pmap Normal_map; - typedef CGAL::Shape_detection_3::Efficient_RANSAC_traits< + typedef CGAL::Shape_detection_3::Shape_detection_traits< K, Pwn_vector, Point_map, Normal_map> Traits; typedef CGAL::Shape_detection_3::Efficient_RANSAC Efficient_ransac; diff --git a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_torus_connected_component.cpp b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_torus_connected_component.cpp index 8f85e529744..e2d2029eef3 100644 --- a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_torus_connected_component.cpp +++ b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_torus_connected_component.cpp @@ -21,7 +21,7 @@ bool test_torus_connected_component() { typedef CGAL::Identity_property_map Point_map; typedef CGAL::Normal_of_point_with_normal_pmap Normal_map; - typedef CGAL::Shape_detection_3::Efficient_RANSAC_traits< + typedef CGAL::Shape_detection_3::Shape_detection_traits< K, Pwn_vector, Point_map, Normal_map> Traits; typedef CGAL::Shape_detection_3::Efficient_RANSAC Efficient_ransac; diff --git a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_torus_parameters.cpp b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_torus_parameters.cpp index 052a7828e56..288da19a919 100644 --- a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_torus_parameters.cpp +++ b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_torus_parameters.cpp @@ -22,7 +22,7 @@ bool test_torus_parameters() { typedef CGAL::Identity_property_map Point_map; typedef CGAL::Normal_of_point_with_normal_pmap Normal_map; - typedef CGAL::Shape_detection_3::Efficient_RANSAC_traits< + typedef CGAL::Shape_detection_3::Shape_detection_traits< K, Pwn_vector, Point_map, Normal_map> Traits; typedef CGAL::Shape_detection_3::Efficient_RANSAC Efficient_ransac; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_shape_detection_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_shape_detection_plugin.cpp index 0dc97d72e2b..7ee70842c8b 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_shape_detection_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_shape_detection_plugin.cpp @@ -74,7 +74,7 @@ class Polyhedron_demo_point_set_shape_detection_plugin : typedef Point_set_3::Point_map PointPMap; typedef Point_set_3::Vector_map NormalPMap; - typedef CGAL::Shape_detection_3::Efficient_RANSAC_traits Traits; + typedef CGAL::Shape_detection_3::Shape_detection_traits Traits; typedef CGAL::Shape_detection_3::Efficient_RANSAC Shape_detection; public: @@ -438,7 +438,7 @@ void Polyhedron_demo_point_set_shape_detection_plugin::on_actionDetect_triggered typedef Point_set::Point_map PointPMap; typedef Point_set::Vector_map NormalPMap; - typedef CGAL::Shape_detection_3::Efficient_RANSAC_traits Traits; + typedef CGAL::Shape_detection_3::Shape_detection_traits Traits; typedef CGAL::Shape_detection_3::Efficient_RANSAC Shape_detection; Shape_detection shape_detection; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Surface_reconstruction_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Surface_reconstruction_plugin.cpp index 9b5aa0262ef..cc84486ec77 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Surface_reconstruction_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Surface_reconstruction_plugin.cpp @@ -1322,7 +1322,7 @@ void Polyhedron_demo_surface_reconstruction_plugin::ransac_reconstruction typedef Point_set::Point_map PointMap; typedef Point_set::Vector_map NormalMap; - typedef CGAL::Shape_detection_3::Efficient_RANSAC_traits Traits; + typedef CGAL::Shape_detection_3::Shape_detection_traits Traits; typedef CGAL::Shape_detection_3::Efficient_RANSAC Shape_detection; local_timer.start();