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

renaming nearest_k_neighbors_in_radius and neighbors_in_radius

This commit is contained in:
Sven Oesau 2024-03-05 10:52:34 +01:00
parent 7bf227d5e6
commit 22e5a3f651
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Orthtree/examples/Orthtree/octree_find_nearest_neighbor.cpp
View File

@ -57,7 +57,7 @@ int main(int argc, char** argv) {
typename Octree::Sphere s(points_to_find[0], 0.0375); typename Octree::Sphere s(points_to_find[0], 0.0375);
std::cout << std::endl << "Closest points within the sphere around " << s.center() << " with squared radius of " << s.squared_radius() << ":" << std::endl; std::cout << std::endl << "Closest points within the sphere around " << s.center() << " with squared radius of " << s.squared_radius() << ":" << std::endl;
octree.neighbors_in_radius octree.neighbors_within_radius
(s, (s,
boost::make_function_output_iterator boost::make_function_output_iterator
([&](const Point_set::Index& nearest) ([&](const Point_set::Index& nearest)
@ -67,7 +67,7 @@ int main(int argc, char** argv) {
std::size_t k = 3; std::size_t k = 3;
std::cout << std::endl << "The up to " << k << " closest points to(" << s.center() << ") within a squared radius of " << s.squared_radius() << " are:" << std::endl; std::cout << std::endl << "The up to " << k << " closest points to(" << s.center() << ") within a squared radius of " << s.squared_radius() << " are:" << std::endl;
octree.nearest_k_neighbors_in_radius octree.nearest_k_neighbors_within_radius
(s, k, (s, k,
boost::make_function_output_iterator boost::make_function_output_iterator
([&](const Point_set::Index& nearest) ([&](const Point_set::Index& nearest)

8
Orthtree/include/CGAL/Orthtree.h
View File

@ -688,7 +688,7 @@ public:
Sphere query_sphere(query, (std::numeric_limits<FT>::max)()); Sphere query_sphere(query, (std::numeric_limits<FT>::max)());
CGAL_precondition(k > 0); CGAL_precondition(k > 0);
return nearest_k_neighbors_in_radius(query_sphere, k, output); return nearest_k_neighbors_within_radius(query_sphere, k, output);
} }
/*! /*!
@ -705,8 +705,8 @@ public:
\warning Nearest neighbor searches requires `GeomTraits` to be a model of `CollectionPartitioningOrthtreeTraits`. \warning Nearest neighbor searches requires `GeomTraits` to be a model of `CollectionPartitioningOrthtreeTraits`.
*/ */
template<typename OutputIterator> template<typename OutputIterator>
auto neighbors_in_radius(const Sphere& query, OutputIterator output) const -> std::enable_if_t<supports_neighbor_search, OutputIterator> { auto neighbors_within_radius(const Sphere& query, OutputIterator output) const -> std::enable_if_t<supports_neighbor_search, OutputIterator> {
return nearest_k_neighbors_in_radius(query, (std::numeric_limits<std::size_t>::max)(), output); return nearest_k_neighbors_within_radius(query, (std::numeric_limits<std::size_t>::max)(), output);
} }
/*! /*!
@ -727,7 +727,7 @@ public:
\warning Nearest neighbor searches requires `GeomTraits` to be a model of `CollectionPartitioningOrthtreeTraits`. \warning Nearest neighbor searches requires `GeomTraits` to be a model of `CollectionPartitioningOrthtreeTraits`.
*/ */
template <typename OutputIterator> template <typename OutputIterator>
auto nearest_k_neighbors_in_radius( auto nearest_k_neighbors_within_radius(
const Sphere& query, const Sphere& query,
std::size_t k, std::size_t k,
OutputIterator output OutputIterator output