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

Rename the recently-added distance functions

This commit is contained in:
Clement Jamin 2017-05-09 16:50:24 +02:00
parent e3d9db4b94
commit a6c1dfc7a1
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Spatial_searching/include/CGAL/Euclidean_distance.h
View File

@ -59,24 +59,32 @@ namespace CGAL {
// During the computation, if the partially-computed distance `pcd` gets greater or equal // During the computation, if the partially-computed distance `pcd` gets greater or equal
// to `stop_if_geq_to_this`, the computation is stopped and `pcd` is returned // to `stop_if_geq_to_this`, the computation is stopped and `pcd` is returned
inline FT transformed_distance(const Query_item& q, const Point_d& p, inline FT transformed_distance(const Query_item& q, const Point_d& p) const
FT stop_if_geq_to_this = std::numeric_limits<FT>::max()) const
{ {
typename SearchTraits::Construct_cartesian_const_iterator_d construct_it = traits.construct_cartesian_const_iterator_d_object(); typename SearchTraits::Construct_cartesian_const_iterator_d construct_it = traits.construct_cartesian_const_iterator_d_object();
typename SearchTraits::Cartesian_const_iterator_d p_begin = construct_it(p), p_end = construct_it(p, 0); typename SearchTraits::Cartesian_const_iterator_d p_begin = construct_it(p), p_end = construct_it(p, 0);
return transformed_distance(q, p_begin, p_end, stop_if_geq_to_this); return transformed_distance_from_coordinates(q, p_begin, p_end);
} }
// During the computation, if the partially-computed distance `pcd` gets greater or equal // During the computation, if the partially-computed distance `pcd` gets greater or equal
// to `stop_if_geq_to_this`, the computation is stopped and `pcd` is returned // to `stop_if_geq_to_this`, the computation is stopped and `pcd` is returned
template <typename Coord_iterator> template <typename Coord_iterator>
inline FT transformed_distance(const Query_item& q, inline FT transformed_distance_from_coordinates(const Query_item& q,
Coord_iterator it_coord_begin, Coord_iterator it_coord_end) const
{
return transformed_distance(q, it_coord_begin, it_coord_end, std::numeric_limits<FT>::max(), D());
}
// During the computation, if the partially-computed distance `pcd` gets greater or equal
// to `stop_if_geq_to_this`, the computation is stopped and `pcd` is returned
template <typename Coord_iterator>
inline FT interruptable_transformed_distance(const Query_item& q,
Coord_iterator it_coord_begin, Coord_iterator it_coord_end, Coord_iterator it_coord_begin, Coord_iterator it_coord_end,
FT stop_if_geq_to_this = std::numeric_limits<FT>::max()) const FT stop_if_geq_to_this) const
{ {
return transformed_distance(q, it_coord_begin, it_coord_end, stop_if_geq_to_this, D()); return transformed_distance(q, it_coord_begin, it_coord_end, stop_if_geq_to_this, D());
} }
// Dynamic version for runtime dimension, taking iterators on coordinates as parameters // Dynamic version for runtime dimension, taking iterators on coordinates as parameters
// During the computation, if the partially-computed distance `pcd` gets greater or equal // During the computation, if the partially-computed distance `pcd` gets greater or equal
// to `stop_if_geq_to_this`, the computation is stopped and `pcd` is returned // to `stop_if_geq_to_this`, the computation is stopped and `pcd` is returned