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

Former-commit-id: aa674c458f110c5c7cc3f5c987b921fcc96e3e7e

4 files changed, 14 insertions, 14 deletions

diff --git a/src/Tangential_complex/benchmark/CMakeLists.txt b/src/Tangential_complex/benchmark/CMakeLists.txt
index ef772be8..8729e394 100644
--- a/src/Tangential_complex/benchmark/CMakeLists.txt
+++ b/src/Tangential_complex/benchmark/CMakeLists.txt
@@ -3,8 +3,7 @@ project(Tangential_complex_benchmark)
 
 if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
   add_executable(Tangential_complex_benchmark benchmark_tc.cpp)
-  target_link_libraries(Tangential_complex_benchmark
-    ${Boost_DATE_TIME_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY})
+  target_link_libraries(Tangential_complex_benchmark ${CGAL_LIBRARY})
   if (TBB_FOUND)
     target_link_libraries(Tangential_complex_benchmark ${TBB_LIBRARIES})
   endif(TBB_FOUND)
diff --git a/src/Tangential_complex/example/CMakeLists.txt b/src/Tangential_complex/example/CMakeLists.txt
index 339d0581..16d1339d 100644
--- a/src/Tangential_complex/example/CMakeLists.txt
+++ b/src/Tangential_complex/example/CMakeLists.txt
@@ -3,9 +3,9 @@ project(Tangential_complex_examples)
 
 if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
   add_executable( Tangential_complex_example_basic example_basic.cpp )
-  target_link_libraries(Tangential_complex_example_basic ${CGAL_LIBRARY} ${Boost_DATE_TIME_LIBRARY})
+  target_link_libraries(Tangential_complex_example_basic ${CGAL_LIBRARY})
   add_executable( Tangential_complex_example_with_perturb example_with_perturb.cpp )
-  target_link_libraries(Tangential_complex_example_with_perturb ${CGAL_LIBRARY} ${Boost_DATE_TIME_LIBRARY})
+  target_link_libraries(Tangential_complex_example_with_perturb ${CGAL_LIBRARY})
   if (TBB_FOUND)
     target_link_libraries(Tangential_complex_example_basic ${TBB_LIBRARIES})
     target_link_libraries(Tangential_complex_example_with_perturb ${TBB_LIBRARIES})
@@ -15,4 +15,7 @@ if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
       COMMAND $<TARGET_FILE:Tangential_complex_example_basic>)
   add_test(NAME Tangential_complex_example_with_perturb
       COMMAND $<TARGET_FILE:Tangential_complex_example_with_perturb>)
+
+  install(TARGETS Tangential_complex_example_basic DESTINATION bin)
+  install(TARGETS Tangential_complex_example_with_perturb DESTINATION bin)
 endif(NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
diff --git a/src/Tangential_complex/include/gudhi/Tangential_complex.h b/src/Tangential_complex/include/gudhi/Tangential_complex.h
index 9fa7c825..a5cefd6a 100644
--- a/src/Tangential_complex/include/gudhi/Tangential_complex.h
+++ b/src/Tangential_complex/include/gudhi/Tangential_complex.h
@@ -1093,8 +1093,8 @@ class Tangential_complex {
     std::size_t num_inserted_points = 1;
 #endif
     // const int NUM_NEIGHBORS = 150;
-    // KNS_range ins_range = m_points_ds.query_k_nearest_neighbors(center_pt, NUM_NEIGHBORS);
-    INS_range ins_range = m_points_ds.query_incremental_nearest_neighbors(center_pt);
+    // KNS_range ins_range = m_points_ds.k_nearest_neighbors(center_pt, NUM_NEIGHBORS);
+    INS_range ins_range = m_points_ds.incremental_nearest_neighbors(center_pt);
 
     // While building the local triangulation, we keep the radius
     // of the sphere "star sphere" centered at "center_vertex"
@@ -1203,7 +1203,7 @@ class Tangential_complex {
     Point center_point = compute_perturbed_point(i);
     // Among updated point, what is the closer from our center point?
     std::size_t closest_pt_index =
-        updated_pts_ds.query_k_nearest_neighbors(center_point, 1, false).begin()->first;
+        updated_pts_ds.k_nearest_neighbors(center_point, 1, false).begin()->first;
 
     typename K::Construct_weighted_point_d k_constr_wp =
         m_k.construct_weighted_point_d_object();
@@ -1315,11 +1315,10 @@ class Tangential_complex {
         m_k.compute_coordinate_d_object();
 
 #ifdef GUDHI_TC_USE_ANOTHER_POINT_SET_FOR_TANGENT_SPACE_ESTIM
-    KNS_range kns_range = m_points_ds_for_tse.query_k_nearest_neighbors(
-                                                                        p, num_pts_for_pca, false);
+    KNS_range kns_range = m_points_ds_for_tse.k_nearest_neighbors(p, num_pts_for_pca, false);
     const Points &points_for_pca = m_points_for_tse;
 #else
-    KNS_range kns_range = m_points_ds.query_k_nearest_neighbors(p, num_pts_for_pca, false);
+    KNS_range kns_range = m_points_ds.k_nearest_neighbors(p, num_pts_for_pca, false);
     const Points &points_for_pca = m_points;
 #endif
 
@@ -1413,11 +1412,10 @@ class Tangential_complex {
       const Point &p = m_points[*it_index];
 
 #ifdef GUDHI_TC_USE_ANOTHER_POINT_SET_FOR_TANGENT_SPACE_ESTIM
-      KNS_range kns_range = m_points_ds_for_tse.query_k_nearest_neighbors(
-                                                                          p, num_pts_for_pca, false);
+      KNS_range kns_range = m_points_ds_for_tse.k_nearest_neighbors(p, num_pts_for_pca, false);
       const Points &points_for_pca = m_points_for_tse;
 #else
-      KNS_range kns_range = m_points_ds.query_k_nearest_neighbors(p, num_pts_for_pca, false);
+      KNS_range kns_range = m_points_ds.k_nearest_neighbors(p, num_pts_for_pca, false);
       const Points &points_for_pca = m_points;
 #endif
 
diff --git a/src/Tangential_complex/test/CMakeLists.txt b/src/Tangential_complex/test/CMakeLists.txt
index fc710676..1948c8f6 100644
--- a/src/Tangential_complex/test/CMakeLists.txt
+++ b/src/Tangential_complex/test/CMakeLists.txt
@@ -5,7 +5,7 @@ if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
   include(GUDHI_test_coverage)
 
   add_executable( Tangential_complex_test_TC test_tangential_complex.cpp )
-  target_link_libraries(Tangential_complex_test_TC ${CGAL_LIBRARY} ${Boost_DATE_TIME_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+  target_link_libraries(Tangential_complex_test_TC ${CGAL_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
   if (TBB_FOUND)
     target_link_libraries(Tangential_complex_test_TC ${TBB_LIBRARIES})
   endif()