Merge rips_complex_module branch

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

Former-commit-id: 0c66037752bc8d5b65729722ef117e13ab8137bf

1 files changed, 2 insertions, 2 deletions

diff --git a/src/Witness_complex/test/witness_complex_points.cpp b/src/Witness_complex/test/witness_complex_points.cpp
index d40bbf14..92f53417 100644
--- a/src/Witness_complex/test/witness_complex_points.cpp
+++ b/src/Witness_complex/test/witness_complex_points.cpp
@@ -34,8 +34,8 @@
 #include <vector>
 
 typedef std::vector<double> Point;
-typedef std::vector< Vertex_handle > typeVectorVertex;
 typedef Gudhi::Simplex_tree<> Simplex_tree;
+typedef std::vector< Simplex_tree::Vertex_handle > typeVectorVertex;
 typedef Gudhi::witness_complex::Witness_complex<Simplex_tree> WitnessComplex;
 
 BOOST_AUTO_TEST_CASE(witness_complex_points) {
@@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE(witness_complex_points) {
   // First test: random choice
   Simplex_tree complex1;
   Gudhi::subsampling::pick_n_random_points(points, 100, std::back_inserter(landmarks));
-  Gudhi::witness_complex::construct_closest_landmark_table(points, landmarks, knn);
+  Gudhi::witness_complex::construct_closest_landmark_table<Simplex_tree::Filtration_value>(points, landmarks, knn);
   assert(!knn.empty());
   WitnessComplex witnessComplex1(knn, 100, 3, complex1);
   BOOST_CHECK(witnessComplex1.is_witness_complex(knn, b_print_output));