summaryrefslogtreecommitdiff
path: root/src/Spatial_searching
diff options
context:
space:
mode:
authorcjamin <cjamin@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2016-10-04 13:32:23 +0000
committercjamin <cjamin@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2016-10-04 13:32:23 +0000
commitf70230dfe91ec9ac87f234c27184dd7d719e9e69 (patch)
tree3fe2df54892a3cfef190e5311fce8668a9e5a911 /src/Spatial_searching
parentb7f3439fefcf1c4a1c28ca47652d7e4844f1abf2 (diff)
Test: kns, kfs... => knn, kfn...
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/subsampling_and_spatialsearching@1623 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 91343f21d81ab127ba6efbf472d153cb4be3f040
Diffstat (limited to 'src/Spatial_searching')
-rw-r--r--src/Spatial_searching/test/test_Kd_tree_search.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/Spatial_searching/test/test_Kd_tree_search.cpp b/src/Spatial_searching/test/test_Kd_tree_search.cpp
index 6f99b288..df00d2b9 100644
--- a/src/Spatial_searching/test/test_Kd_tree_search.cpp
+++ b/src/Spatial_searching/test/test_Kd_tree_search.cpp
@@ -71,14 +71,14 @@ BOOST_AUTO_TEST_CASE(test_Kd_tree_search)
points_ds.query_incremental_nearest_neighbors(points[10]).begin()->first;
BOOST_CHECK(closest_pt_index == 10);
- auto ins_range = points_ds.query_incremental_nearest_neighbors(points[20]);
+ auto inn_range = points_ds.query_incremental_nearest_neighbors(points[20]);
std::vector<std::size_t> inn_result;
last_dist = -1.;
- auto ins_it = ins_range.begin();
- for (int i = 0 ; i < 10 ; ++ins_it, ++i)
+ auto inn_it = inn_range.begin();
+ for (int i = 0 ; i < 10 ; ++inn_it, ++i)
{
- auto const& nghb = *ins_it;
+ auto const& nghb = *inn_it;
BOOST_CHECK(nghb.second > last_dist);
inn_result.push_back(nghb.second);
last_dist = nghb.second;
@@ -88,11 +88,11 @@ BOOST_AUTO_TEST_CASE(test_Kd_tree_search)
BOOST_CHECK(knn_result == inn_result);
// Test query_k_farthest_neighbors
- auto kfs_range = points_ds.query_k_farthest_neighbors(points[20], 10, true);
+ auto kfn_range = points_ds.query_k_farthest_neighbors(points[20], 10, true);
std::vector<std::size_t> kfn_result;
- last_dist = kfs_range.begin()->second;
- for (auto const& nghb : kfs_range)
+ last_dist = kfn_range.begin()->second;
+ for (auto const& nghb : kfn_range)
{
BOOST_CHECK(nghb.second <= last_dist);
kfn_result.push_back(nghb.second);
@@ -100,14 +100,14 @@ BOOST_AUTO_TEST_CASE(test_Kd_tree_search)
}
// Test query_k_farthest_neighbors
- auto ifs_range = points_ds.query_incremental_farthest_neighbors(points[20]);
+ auto ifn_range = points_ds.query_incremental_farthest_neighbors(points[20]);
std::vector<std::size_t> ifn_result;
- last_dist = ifs_range.begin()->second;
- auto ifs_it = ifs_range.begin();
- for (int i = 0; i < 10; ++ifs_it, ++i)
+ last_dist = ifn_range.begin()->second;
+ auto ifn_it = ifn_range.begin();
+ for (int i = 0; i < 10; ++ifn_it, ++i)
{
- auto const& nghb = *ifs_it;
+ auto const& nghb = *ifn_it;
BOOST_CHECK(nghb.second <= last_dist);
ifn_result.push_back(nghb.second);
last_dist = nghb.second;