diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-10-20 10:04:05 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-10-20 10:04:05 +0000 |
| commit | 8d656e33138ef8b3a7d86a7375c92646efc29511 (patch) | |
| tree | 3711227c4c1b2a6e9f25dda1db8dafb8365063a0 /src/cython/include/Witness_complex_interface.h | |
| parent | 355dc2a0ae73f243fc0aa8d7c797509d8ba5e6b4 (diff) | |
| parent | 30e538a98919004e36b3b382017884486919cb6e (diff) | |
Merge last trunk modification
Fix doc issue
Still doc issue
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@1739 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 0a99345f06e93a3525691699a6fe1505979e8e8e
Diffstat (limited to 'src/cython/include/Witness_complex_interface.h')
| -rw-r--r-- | src/cython/include/Witness_complex_interface.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/cython/include/Witness_complex_interface.h b/src/cython/include/Witness_complex_interface.h index bdfea91f..ab99adf5 100644 --- a/src/cython/include/Witness_complex_interface.h +++ b/src/cython/include/Witness_complex_interface.h @@ -25,7 +25,8 @@ #include <gudhi/Simplex_tree.h> #include <gudhi/Witness_complex.h> -#include <gudhi/Landmark_choice_by_furthest_point.h> +#include <gudhi/Construct_closest_landmark_table.h> +#include <gudhi/pick_n_random_points.h> #include "Persistent_cohomology_interface.h" @@ -48,10 +49,11 @@ class Witness_complex_interface { Witness_complex_interface(std::vector<std::vector<double>>&points, int number_of_landmarks) : pcoh_(nullptr) { std::vector<std::vector< int > > knn; + std::vector<std::vector<double>> landmarks; + Gudhi::subsampling::pick_n_random_points(points, number_of_landmarks, std::back_inserter(landmarks)); + Gudhi::witness_complex::construct_closest_landmark_table(points, landmarks, knn); - Gudhi::witness_complex::landmark_choice_by_furthest_point(points, number_of_landmarks, knn); Gudhi::witness_complex::witness_complex(knn, number_of_landmarks, points[0].size(), simplex_tree_); - } bool find_simplex(const Simplex& vh) { |