Merge last trunk modifications

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

Former-commit-id: 9ea024337f05cfc4f9a1d645c6e6ee9aac9700ba

1 files changed, 10 insertions, 2 deletions

diff --git a/src/Witness_complex/doc/Witness_complex_doc.h b/src/Witness_complex/doc/Witness_complex_doc.h
index 20834be0..5d5c0735 100644
--- a/src/Witness_complex/doc/Witness_complex_doc.h
+++ b/src/Witness_complex/doc/Witness_complex_doc.h
@@ -90,8 +90,9 @@ int main(int argc, char * const argv[]) {
   Gudhi::Points_off_reader<Point_d> off_reader(file_name);
   point_vector = Point_vector(off_reader.get_point_cloud());
 
-  // Choose landmarks
-  Gudhi::subsampling::pick_n_random_points(point_vector, nbL, std::back_inserter(landmarks));
+  // Choose landmarks (one can choose either of the two methods below)
+  // Gudhi::subsampling::pick_n_random_points(point_vector, nbL, std::back_inserter(landmarks));
+  Gudhi::subsampling::choose_n_farthest_points(K(), point_vector, nbL, Gudhi::subsampling::random_starting_point, std::back_inserter(landmarks));
 
   // Compute witness complex
   Witness_complex witness_complex(landmarks,
@@ -109,6 +110,13 @@ int main(int argc, char * const argv[]) {
 
    \include Witness_complex/strong_witness_persistence.cpp
 
+   \section witnessexample3 Example3: Computing relaxed witness complex persistence from a distance matrix 
+
+   In this example we compute the relaxed witness complex persistence from a given matrix of closest landmarks to each witness.
+   Each landmark is given as the couple (index, distance).
+
+   \include Witness_complex/example_nearest_landmark_table.cpp
+
    \copyright GNU General Public License v3.