Merge from trunk

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

Former-commit-id: 7872aa224ee471c05e9213b81192d304254e608a

6 files changed, 8 insertions, 11 deletions

diff --git a/src/Witness_complex/example/CMakeLists.txt b/src/Witness_complex/example/CMakeLists.txt
index 83d9127e..f8527e0f 100644
--- a/src/Witness_complex/example/CMakeLists.txt
+++ b/src/Witness_complex/example/CMakeLists.txt
@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 2.6)
 project(Witness_complex_examples)
 
 add_executable ( Witness_complex_example_nearest_landmark_table example_nearest_landmark_table.cpp )
-target_link_libraries(Witness_complex_example_nearest_landmark_table ${Boost_SYSTEM_LIBRARY})
 if (TBB_FOUND)
   target_link_libraries(Witness_complex_example_nearest_landmark_table ${TBB_LIBRARIES})
 endif()
@@ -14,12 +13,10 @@ install(TARGETS Witness_complex_example_nearest_landmark_table DESTINATION bin)
 # CGAL and Eigen3 are required for Euclidean version of Witness
 if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.6.0)
   add_executable( Witness_complex_example_off example_witness_complex_off.cpp )
-  target_link_libraries(Witness_complex_example_off ${Boost_SYSTEM_LIBRARY})
   add_executable ( Witness_complex_example_sphere example_witness_complex_sphere.cpp )
-  target_link_libraries(Witness_complex_example_sphere ${Boost_SYSTEM_LIBRARY})
 
   add_executable ( Witness_complex_example_witness_persistence example_witness_complex_persistence.cpp )
-  target_link_libraries(Witness_complex_example_witness_persistence ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
+  target_link_libraries(Witness_complex_example_witness_persistence ${Boost_PROGRAM_OPTIONS_LIBRARY})
 
   if (TBB_FOUND)
     target_link_libraries(Witness_complex_example_witness_persistence ${TBB_LIBRARIES})
diff --git a/src/Witness_complex/include/gudhi/Euclidean_strong_witness_complex.h b/src/Witness_complex/include/gudhi/Euclidean_strong_witness_complex.h
index fb669ef8..4f3cef4f 100644
--- a/src/Witness_complex/include/gudhi/Euclidean_strong_witness_complex.h
+++ b/src/Witness_complex/include/gudhi/Euclidean_strong_witness_complex.h
@@ -84,7 +84,7 @@ class Euclidean_strong_witness_complex
     : landmarks_(std::begin(landmarks), std::end(landmarks)), landmark_tree_(landmarks_) {
     nearest_landmark_table_.reserve(boost::size(witnesses));
     for (auto w : witnesses)
-      nearest_landmark_table_.push_back(landmark_tree_.query_incremental_nearest_neighbors(w));
+      nearest_landmark_table_.push_back(landmark_tree_.incremental_nearest_neighbors(w));
   }
 
   /** \brief Returns the point corresponding to the given vertex.
diff --git a/src/Witness_complex/include/gudhi/Euclidean_witness_complex.h b/src/Witness_complex/include/gudhi/Euclidean_witness_complex.h
index 6afe9a5d..ff8bb139 100644
--- a/src/Witness_complex/include/gudhi/Euclidean_witness_complex.h
+++ b/src/Witness_complex/include/gudhi/Euclidean_witness_complex.h
@@ -86,7 +86,7 @@ class Euclidean_witness_complex
     : landmarks_(std::begin(landmarks), std::end(landmarks)), landmark_tree_(landmarks) {
     nearest_landmark_table_.reserve(boost::size(witnesses));
     for (auto w : witnesses)
-      nearest_landmark_table_.push_back(landmark_tree_.query_incremental_nearest_neighbors(w));
+      nearest_landmark_table_.push_back(landmark_tree_.incremental_nearest_neighbors(w));
   }
 
   /** \brief Returns the point corresponding to the given vertex.
diff --git a/src/Witness_complex/test/CMakeLists.txt b/src/Witness_complex/test/CMakeLists.txt
index 152e2f2c..0b523eaf 100644
--- a/src/Witness_complex/test/CMakeLists.txt
+++ b/src/Witness_complex/test/CMakeLists.txt
@@ -4,7 +4,7 @@ project(Witness_complex_tests)
 include(GUDHI_test_coverage)
 
 add_executable ( Witness_complex_test_simple_witness_complex test_simple_witness_complex.cpp )
-target_link_libraries(Witness_complex_test_simple_witness_complex ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+target_link_libraries(Witness_complex_test_simple_witness_complex ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 if (TBB_FOUND)
   target_link_libraries(Witness_complex_test_simple_witness_complex ${TBB_LIBRARIES})
 endif(TBB_FOUND)
@@ -14,7 +14,7 @@ gudhi_add_coverage_test(Witness_complex_test_simple_witness_complex)
 # CGAL and Eigen3 are required for Euclidean version of Witness
 if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.6.0)
   add_executable ( Witness_complex_test_euclidean_simple_witness_complex test_euclidean_simple_witness_complex.cpp )
-  target_link_libraries(Witness_complex_test_euclidean_simple_witness_complex ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+  target_link_libraries(Witness_complex_test_euclidean_simple_witness_complex ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
   if (TBB_FOUND)
     target_link_libraries(Witness_complex_test_euclidean_simple_witness_complex ${TBB_LIBRARIES})
   endif(TBB_FOUND)
diff --git a/src/Witness_complex/test/test_euclidean_simple_witness_complex.cpp b/src/Witness_complex/test/test_euclidean_simple_witness_complex.cpp
index 62fd1157..4f718203 100644
--- a/src/Witness_complex/test/test_euclidean_simple_witness_complex.cpp
+++ b/src/Witness_complex/test/test_euclidean_simple_witness_complex.cpp
@@ -75,7 +75,7 @@ BOOST_AUTO_TEST_CASE(simple_witness_complex) {
   Kd_tree landmark_tree(landmarks);
   Nearest_landmark_table nearest_landmark_table;
   for (auto w: witnesses)
-    nearest_landmark_table.push_back(landmark_tree.query_incremental_nearest_neighbors(w));
+    nearest_landmark_table.push_back(landmark_tree.incremental_nearest_neighbors(w));
 
   // Weak witness complex: Euclidean version
   EuclideanWitnessComplex eucl_witness_complex(landmarks,
diff --git a/src/Witness_complex/utilities/CMakeLists.txt b/src/Witness_complex/utilities/CMakeLists.txt
index 67cc69e9..918ab864 100644
--- a/src/Witness_complex/utilities/CMakeLists.txt
+++ b/src/Witness_complex/utilities/CMakeLists.txt
@@ -4,10 +4,10 @@ project(Witness_complex_utilities)
 # CGAL and Eigen3 are required for Euclidean version of Witness
 if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.6.0)
   add_executable( Witness_complex_example_strong_off example_strong_witness_complex_off.cpp )
-  target_link_libraries(Witness_complex_example_strong_off ${Boost_SYSTEM_LIBRARY})
+  target_link_libraries(Witness_complex_example_strong_off)
 
   add_executable ( Witness_complex_example_strong_witness_persistence example_strong_witness_persistence.cpp )
-  target_link_libraries(Witness_complex_example_strong_witness_persistence ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
+  target_link_libraries(Witness_complex_example_strong_witness_persistence ${Boost_PROGRAM_OPTIONS_LIBRARY})
 
   if (TBB_FOUND)
     target_link_libraries(Witness_complex_example_strong_witness_persistence ${TBB_LIBRARIES})