Merge last trunk modifications

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_automatic_dimension_set@2811 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 2a37c02ca51d0df28a981207db6ecc1bd0991ffa

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 663a103a..8a8334c3 100644
--- a/src/Spatial_searching/test/test_Kd_tree_search.cpp
+++ b/src/Spatial_searching/test/test_Kd_tree_search.cpp
@@ -48,12 +48,12 @@ BOOST_AUTO_TEST_CASE(test_Kd_tree_search) {
 
   Points_ds points_ds(points);
 
-  // Test query_k_nearest_neighbors
+  // Test k_nearest_neighbors
   std::size_t closest_pt_index =
-      points_ds.query_k_nearest_neighbors(points[10], 1, false).begin()->first;
+      points_ds.k_nearest_neighbors(points[10], 1, false).begin()->first;
   BOOST_CHECK(closest_pt_index == 10);
 
-  auto kns_range = points_ds.query_k_nearest_neighbors(points[20], 10, true);
+  auto kns_range = points_ds.k_nearest_neighbors(points[20], 10, true);
 
   std::vector<std::size_t> knn_result;
   FT last_dist = -1.;
@@ -63,12 +63,12 @@ BOOST_AUTO_TEST_CASE(test_Kd_tree_search) {
     last_dist = nghb.second;
   }
 
-  // Test query_incremental_nearest_neighbors 
+  // Test incremental_nearest_neighbors 
   closest_pt_index =
-      points_ds.query_incremental_nearest_neighbors(points[10]).begin()->first;
+      points_ds.incremental_nearest_neighbors(points[10]).begin()->first;
   BOOST_CHECK(closest_pt_index == 10);
 
-  auto inn_range = points_ds.query_incremental_nearest_neighbors(points[20]);
+  auto inn_range = points_ds.incremental_nearest_neighbors(points[20]);
 
   std::vector<std::size_t> inn_result;
   last_dist = -1.;
@@ -83,8 +83,8 @@ BOOST_AUTO_TEST_CASE(test_Kd_tree_search) {
   // Same result for KNN and INN?
   BOOST_CHECK(knn_result == inn_result);
 
-  // Test query_k_farthest_neighbors
-  auto kfn_range = points_ds.query_k_farthest_neighbors(points[20], 10, true);
+  // Test k_furthest_neighbors
+  auto kfn_range = points_ds.k_furthest_neighbors(points[20], 10, true);
 
   std::vector<std::size_t> kfn_result;
   last_dist = kfn_range.begin()->second;
@@ -94,8 +94,8 @@ BOOST_AUTO_TEST_CASE(test_Kd_tree_search) {
     last_dist = nghb.second;
   }
 
-  // Test query_k_farthest_neighbors
-  auto ifn_range = points_ds.query_incremental_farthest_neighbors(points[20]);
+  // Test k_furthest_neighbors
+  auto ifn_range = points_ds.incremental_furthest_neighbors(points[20]);
 
   std::vector<std::size_t> ifn_result;
   last_dist = ifn_range.begin()->second;
@@ -110,10 +110,10 @@ BOOST_AUTO_TEST_CASE(test_Kd_tree_search) {
   // Same result for KFN and IFN?
   BOOST_CHECK(kfn_result == ifn_result);
 
-  // Test near search
+  // Test all_near_neighbors
   Point rs_q(rd.get_double(-1., 1), rd.get_double(-1., 1), rd.get_double(-1., 1), rd.get_double(-1., 1));
   std::vector<std::size_t> rs_result;
-  points_ds.near_search(rs_q, 0.5, std::back_inserter(rs_result));
+  points_ds.all_near_neighbors(rs_q, 0.5, std::back_inserter(rs_result));
   K k;
   for (auto const& p_idx : rs_result)
     BOOST_CHECK(k.squared_distance_d_object()(points[p_idx], rs_q) <= 0.5);