songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename property map

This commit is contained in:
Sébastien Loriot 2015-03-26 23:08:03 +01:00
parent fd69bbcb4c
commit c0f0b1cd32
13 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Point_set_shape_detection_3/doc/Point_set_shape_detection_3/Concepts/EfficientRANSACTraits.h
View File

@ -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;
};

8
Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_basic.cpp
View File

@ -12,13 +12,13 @@
typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel;
typedef CGAL::Point_with_normal_3<Kernel> Point_with_normal;
typedef std::vector<Point_with_normal> Pwn_vector;
typedef CGAL::Identity_property_map<Point_with_normal> Point_pmap;
typedef CGAL::Normal_of_point_with_normal_pmap<Kernel> Normal_pmap;
typedef CGAL::Identity_property_map<Point_with_normal> Point_map;
typedef CGAL::Normal_of_point_with_normal_pmap<Kernel> 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
<Kernel, Pwn_vector::iterator, Point_pmap, Normal_pmap> Traits;
<Kernel, Pwn_vector::iterator, Point_map, Normal_map> Traits;
typedef CGAL::Shape_detection_3::Efficient_RANSAC<Traits> Efficient_ransac;
typedef CGAL::Shape_detection_3::Plane<Traits> 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;

8
Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_parameters.cpp
View File

@ -15,13 +15,13 @@ typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel;
typedef Kernel::FT FT;
typedef CGAL::Point_with_normal_3<Kernel> Point_with_normal;
typedef std::vector<Point_with_normal> Pwn_vector;
typedef CGAL::Identity_property_map<Point_with_normal> Point_pmap;
typedef CGAL::Normal_of_point_with_normal_pmap<Kernel> Normal_pmap;
typedef CGAL::Identity_property_map<Point_with_normal> Point_map;
typedef CGAL::Normal_of_point_with_normal_pmap<Kernel> 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<Kernel,
Pwn_vector::iterator, Point_pmap, Normal_pmap> Traits;
Pwn_vector::iterator, Point_map, Normal_map> Traits;
typedef CGAL::Shape_detection_3::Efficient_RANSAC<Traits> Efficient_ransac;
typedef CGAL::Shape_detection_3::Cone<Traits> Cone;
typedef CGAL::Shape_detection_3::Cylinder<Traits> 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;

8
Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_point_access.cpp
View File

@ -15,13 +15,13 @@ typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel;
typedef Kernel::FT FT;
typedef CGAL::Point_with_normal_3<Kernel> Point_with_normal;
typedef std::vector<Point_with_normal> Pwn_vector;
typedef CGAL::Identity_property_map<Point_with_normal> Point_pmap;
typedef CGAL::Normal_of_point_with_normal_pmap<Kernel> Normal_pmap;
typedef CGAL::Identity_property_map<Point_with_normal> Point_map;
typedef CGAL::Normal_of_point_with_normal_pmap<Kernel> 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<Kernel,
Pwn_vector::iterator, Point_pmap, Normal_pmap> Traits;
Pwn_vector::iterator, Point_map, Normal_map> Traits;
typedef CGAL::Shape_detection_3::Efficient_RANSAC<Traits> Efficient_ransac;
typedef CGAL::Shape_detection_3::Plane<Traits> 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;

4
Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Cone.h
View File

@ -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.

4
Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Cylinder.h
View File

@ -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.

12
Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Efficient_RANSAC.h
View File

@ -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<Traits> 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<FT> m_level_weighting; // sum must be 1
};

4
Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Efficient_RANSAC_traits.h
View File

@ -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

8
Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Octree.h
View File

@ -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<class Sd_traits>
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;
};
}
}

4
Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Plane.h
View File

@ -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.

12
Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Shape_base.h
View File

@ -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<Traits> Shape;
///< own type.
@ -463,8 +463,8 @@ namespace CGAL {
void compute(const std::set<std::size_t>& 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
};
}

4
Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Sphere.h
View File

@ -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.

4
Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Torus.h
View File

@ -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.