From c0f0b1cd32f94f8b0a7ed9f8deaaf44efd78caea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Thu, 26 Mar 2015 23:08:03 +0100 Subject: [PATCH] rename property map --- .../Concepts/EfficientRANSACTraits.h | 8 ++++---- .../efficient_RANSAC_basic.cpp | 8 ++++---- .../efficient_RANSAC_parameters.cpp | 8 ++++---- .../efficient_RANSAC_point_access.cpp | 8 ++++---- .../include/CGAL/Shape_detection_3/Cone.h | 4 ++-- .../include/CGAL/Shape_detection_3/Cylinder.h | 4 ++-- .../CGAL/Shape_detection_3/Efficient_RANSAC.h | 12 ++++++------ .../CGAL/Shape_detection_3/Efficient_RANSAC_traits.h | 4 ++-- .../include/CGAL/Shape_detection_3/Octree.h | 8 ++++---- .../include/CGAL/Shape_detection_3/Plane.h | 4 ++-- .../include/CGAL/Shape_detection_3/Shape_base.h | 12 ++++++------ .../include/CGAL/Shape_detection_3/Sphere.h | 4 ++-- .../include/CGAL/Shape_detection_3/Torus.h | 4 ++-- 13 files changed, 44 insertions(+), 44 deletions(-) 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/EfficientRANSACTraits.h index 5606a11ca2a..70510865e62 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/EfficientRANSACTraits.h @@ -22,8 +22,8 @@ public: typedef unspecified_type Geom_traits; /// Random access iterator used to get the input points and normals. typedef InputIt Input_iterator; - /// property map: a model of `ReadablePropertyMap` with `Input_iterator` as key type and `Geom_traits::Point_3` as value type - typedef Ppmap Point_pmap; - /// property map: a model of `ReadablePropertyMap` with `Input_iterator` as key type and `Geom_traits::Vector_3` as value type - typedef Npmap Normal_pmap; + /// a model of `ReadablePropertyMap` with `Input_iterator` as key type and `Geom_traits::Point_3` as value type + typedef Ppmap Point_map; + /// a model of `ReadablePropertyMap` with `Input_iterator` as key type and `Geom_traits::Vector_3` as value type + typedef Npmap Normal_map; }; 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 495640ba7a9..d826c65c553 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 @@ -12,13 +12,13 @@ typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; typedef CGAL::Point_with_normal_3 Point_with_normal; typedef std::vector Pwn_vector; -typedef CGAL::Identity_property_map Point_pmap; -typedef CGAL::Normal_of_point_with_normal_pmap Normal_pmap; +typedef CGAL::Identity_property_map Point_map; +typedef CGAL::Normal_of_point_with_normal_pmap Normal_map; // In Efficient_RANSAC_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; + Traits; typedef CGAL::Shape_detection_3::Efficient_RANSAC Efficient_ransac; typedef CGAL::Shape_detection_3::Plane Plane; @@ -35,7 +35,7 @@ int main() if (!stream || !CGAL::read_xyz_points_and_normals(stream, std::back_inserter(points), - Normal_pmap())) + Normal_map())) { std::cerr << "Error: cannot read file cube.pwn" << std::endl; return EXIT_FAILURE; 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 72b8ec9bb78..4233701e877 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 @@ -15,13 +15,13 @@ typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; typedef Kernel::FT FT; typedef CGAL::Point_with_normal_3 Point_with_normal; typedef std::vector Pwn_vector; -typedef CGAL::Identity_property_map Point_pmap; -typedef CGAL::Normal_of_point_with_normal_pmap Normal_pmap; +typedef CGAL::Identity_property_map Point_map; +typedef CGAL::Normal_of_point_with_normal_pmap Normal_map; // In Efficient_RANSAC_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; + Pwn_vector::iterator, Point_map, Normal_map> Traits; typedef CGAL::Shape_detection_3::Efficient_RANSAC Efficient_ransac; typedef CGAL::Shape_detection_3::Cone Cone; typedef CGAL::Shape_detection_3::Cylinder Cylinder; @@ -43,7 +43,7 @@ int main() if (!stream || !CGAL::read_xyz_points_and_normals(stream, std::back_inserter(points), - Normal_pmap())) + Normal_map())) { std::cerr << "Error: cannot read file cube.pwn" << std::endl; return EXIT_FAILURE; 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 9d9d79caa16..d83db2fa0bf 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 @@ -15,13 +15,13 @@ typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; typedef Kernel::FT FT; typedef CGAL::Point_with_normal_3 Point_with_normal; typedef std::vector Pwn_vector; -typedef CGAL::Identity_property_map Point_pmap; -typedef CGAL::Normal_of_point_with_normal_pmap Normal_pmap; +typedef CGAL::Identity_property_map Point_map; +typedef CGAL::Normal_of_point_with_normal_pmap Normal_map; // In Efficient_RANSAC_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; + Pwn_vector::iterator, Point_map, Normal_map> Traits; typedef CGAL::Shape_detection_3::Efficient_RANSAC Efficient_ransac; typedef CGAL::Shape_detection_3::Plane Plane; @@ -39,7 +39,7 @@ int main() if (!stream || !CGAL::read_xyz_points_and_normals(stream, std::back_inserter(points), - Normal_pmap())) + Normal_map())) { std::cerr << "Error: cannot read file cube.pwn" << std::endl; return EXIT_FAILURE; diff --git a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Cone.h b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Cone.h index e5acc9c5c67..cec2dc03a49 100644 --- a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Cone.h +++ b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Cone.h @@ -53,9 +53,9 @@ namespace CGAL { /// \cond SKIP_IN_MANUAL typedef typename Traits::Input_iterator Input_iterator; ///< random access iterator for input data. - typedef typename Traits::Point_pmap Point_pmap; + typedef typename Traits::Point_map Point_map; ///< property map to access the location of an input point. - typedef typename Traits::Normal_pmap Normal_pmap; + typedef typename Traits::Normal_map Normal_map; ///< property map to access the unoriented normal of an input point. typedef typename Traits::Geom_traits::FT FT; ///< number type. typedef typename Traits::Geom_traits::Point_3 Point;///< point type. diff --git a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Cylinder.h b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Cylinder.h index c2fa9af712d..978b97e7584 100644 --- a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Cylinder.h +++ b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Cylinder.h @@ -51,9 +51,9 @@ namespace CGAL { /// \cond SKIP_IN_MANUAL typedef typename Traits::Input_iterator Input_iterator; ///< random access iterator for input data. - typedef typename Traits::Point_pmap Point_pmap; + typedef typename Traits::Point_map Point_map; ///< property map to access the location of an input point. - typedef typename Traits::Normal_pmap Normal_pmap; + typedef typename Traits::Normal_map Normal_map; ///< property map to access the unoriented normal of an input point. typedef typename Traits::Geom_traits::Vector_3 Vector; ///< vector type. typedef typename Traits::Geom_traits::Point_3 Point; ///< point type. diff --git a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Efficient_RANSAC.h b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Efficient_RANSAC.h index d7dedba6325..685101cc42b 100644 --- a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Efficient_RANSAC.h +++ b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Efficient_RANSAC.h @@ -93,9 +93,9 @@ shape. The implementation follows \cgalCite{Schnabel07}. typedef typename Traits::Geom_traits::FT FT; ///< number type. typedef typename Traits::Geom_traits::Point_3 Point; ///< point type. typedef typename Traits::Geom_traits::Vector_3 Vector; ///< vector type. - typedef typename Traits::Point_pmap Point_pmap; + typedef typename Traits::Point_map Point_map; ///< property map to access the location of an input point. - typedef typename Traits::Normal_pmap Normal_pmap; + typedef typename Traits::Normal_map Normal_map; ///< property map to access the unoriented normal of an input point typedef Shape_base Shape; ///< shape type. @@ -189,9 +189,9 @@ shape. The implementation follows \cgalCite{Schnabel07}. ///< Range of input data providing 'Input_iterator' for random access. Model of the 'boost:RandomAccessRange'. RandomAccessInputRange &input_range, ///< past-the-end random access iterator over the input points. - Point_pmap point_pmap = Point_pmap(), + Point_map point_pmap = Point_map(), ///< property map to access the position of an input point. - Normal_pmap normal_pmap = Normal_pmap() + Normal_map normal_pmap = Normal_map() ///< property map to access the normal of an input point. ) { clear(); @@ -802,8 +802,8 @@ shape. The implementation follows \cgalCite{Schnabel07}. // iterators of input data bool m_valid_iterators; Input_iterator m_inputIterator_first, m_inputIterator_beyond; - Point_pmap m_point_pmap; - Normal_pmap m_normal_pmap; + Point_map m_point_pmap; + Normal_map m_normal_pmap; std::vector m_level_weighting; // sum must be 1 }; 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/Efficient_RANSAC_traits.h index 21be95af816..2ef21278caf 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/Efficient_RANSAC_traits.h @@ -51,9 +51,9 @@ namespace CGAL { /// typedef InputIterator Input_iterator; /// - typedef Ppmap Point_pmap; + typedef Ppmap Point_map; /// - typedef Npmap Normal_pmap; + typedef Npmap Normal_map; }; } } // end of namespace CGAL::Shape_detection_3 diff --git a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Octree.h b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Octree.h index b7a01c97e1f..bb49ba1b84e 100644 --- a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Octree.h +++ b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Octree.h @@ -170,8 +170,8 @@ namespace CGAL { typedef typename Sd_traits::Geom_traits::Point_3 Point; typedef typename Sd_traits::Geom_traits::Vector_3 Vector; typedef typename Sd_traits::Geom_traits::FT FT; - typedef typename Sd_traits::Point_pmap Point_pmap; - typedef typename Sd_traits::Normal_pmap Normal_pmap; + typedef typename Sd_traits::Point_map Point_map; + typedef typename Sd_traits::Normal_map Normal_map; template friend class ::CGAL::Shape_detection_3::Efficient_RANSAC; @@ -680,8 +680,8 @@ namespace CGAL { std::size_t m_bucket_size; std::size_t m_set_max_level; std::size_t m_max_level; - Point_pmap m_point_pmap; - Normal_pmap m_normal_pmap; + Point_map m_point_pmap; + Normal_map m_normal_pmap; }; } } diff --git a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Plane.h b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Plane.h index 4b13bad04ec..044d8ff856a 100644 --- a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Plane.h +++ b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Plane.h @@ -40,9 +40,9 @@ namespace CGAL { /// \cond SKIP_IN_MANUAL typedef typename Traits::Input_iterator Input_iterator; ///< random access iterator for input data. - typedef typename Traits::Point_pmap Point_pmap; + typedef typename Traits::Point_map Point_map; ///< property map to access the location of an input point. - typedef typename Traits::Normal_pmap Normal_pmap; + typedef typename Traits::Normal_map Normal_map; ///< property map to access the unoriented normal of an input point. typedef typename Traits::Geom_traits::FT FT; ///< number type. typedef typename Traits::Geom_traits::Point_3 Point; ///< point type. diff --git a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Shape_base.h b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Shape_base.h index cbdea0facdf..124cb4990e8 100644 --- a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Shape_base.h +++ b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Shape_base.h @@ -69,9 +69,9 @@ namespace CGAL { /// \cond SKIP_IN_MANUAL typedef typename Traits::Input_iterator Input_iterator; ///< random access iterator for input data. - typedef typename Traits::Point_pmap Point_pmap; + typedef typename Traits::Point_map Point_map; ///< property map to access the location of an input point. - typedef typename Traits::Normal_pmap Normal_pmap; + typedef typename Traits::Normal_map Normal_map; ///< property map to access the unoriented normal of an input point. typedef Shape_base Shape; ///< own type. @@ -463,8 +463,8 @@ namespace CGAL { void compute(const std::set& indices, Input_iterator first, - Point_pmap point_pmap, - Normal_pmap normal_pmap, + Point_map point_pmap, + Normal_map normal_pmap, FT epsilon, FT normal_threshold) { if (indices.size() < minimum_sample_size()) @@ -576,8 +576,8 @@ namespace CGAL { bool m_has_connected_component; Input_iterator m_first; - Point_pmap m_point_pmap; - Normal_pmap m_normal_pmap; + Point_map m_point_pmap; + Normal_map m_normal_pmap; /// \endcond }; } diff --git a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Sphere.h b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Sphere.h index fb56d0ca434..d62a8510917 100644 --- a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Sphere.h +++ b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Sphere.h @@ -41,9 +41,9 @@ namespace CGAL { /// \cond SKIP_IN_MANUAL typedef typename Traits::Input_iterator Input_iterator; ///< random access iterator for input data. - typedef typename Traits::Point_pmap Point_pmap; + typedef typename Traits::Point_map Point_map; ///< property map to access the location of an input point. - typedef typename Traits::Normal_pmap Normal_pmap; + typedef typename Traits::Normal_map Normal_map; ///< property map to access the unoriented normal of an input point. typedef typename Traits::Geom_traits::Vector_3 Vector; ///< vector type. diff --git a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Torus.h b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Torus.h index 6639e029df4..43f2905b337 100644 --- a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Torus.h +++ b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Torus.h @@ -44,9 +44,9 @@ namespace CGAL { /// \cond SKIP_IN_MANUAL typedef typename Traits::Input_iterator Input_iterator; ///< random access iterator for input data. - typedef typename Traits::Point_pmap Point_pmap; + typedef typename Traits::Point_map Point_map; ///< property map to access the location of an input point. - typedef typename Traits::Normal_pmap Normal_pmap; + typedef typename Traits::Normal_map Normal_map; ///< property map to access the unoriented normal of an input point. typedef typename Traits::Geom_traits::FT FT; ///< number type. typedef typename Traits::Geom_traits::Point_3 Point; ///< point type.