diff options
| author | Gard Spreemann <gspr@nonempty.org> | 2020-12-16 15:17:15 +0100 |
|---|---|---|
| committer | Gard Spreemann <gspr@nonempty.org> | 2020-12-16 15:17:15 +0100 |
| commit | 289baa1aadd248940439698173caaa345ac0ba3d (patch) | |
| tree | 719f4cee23b2eb5b98b51fb7520336df920024ae /src/python/include/Subsampling_interface.h | |
| parent | 5a450e1d5e0faac25085fb96d756d5963d0a15c4 (diff) | |
| parent | b6a3def70b15baf2dda0844762dcd291e240d2c1 (diff) | |
Merge branch 'dfsg/latest' into debian/sid
Diffstat (limited to 'src/python/include/Subsampling_interface.h')
| -rw-r--r-- | src/python/include/Subsampling_interface.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/python/include/Subsampling_interface.h b/src/python/include/Subsampling_interface.h index cdda851f..6aee7231 100644 --- a/src/python/include/Subsampling_interface.h +++ b/src/python/include/Subsampling_interface.h @@ -11,6 +11,7 @@ #ifndef INCLUDE_SUBSAMPLING_INTERFACE_H_ #define INCLUDE_SUBSAMPLING_INTERFACE_H_ +#include <gudhi/distance_functions.h> #include <gudhi/choose_n_farthest_points.h> #include <gudhi/pick_n_random_points.h> #include <gudhi/sparsify_point_set.h> @@ -27,14 +28,13 @@ namespace subsampling { using Subsampling_dynamic_kernel = CGAL::Epick_d< CGAL::Dynamic_dimension_tag >; using Subsampling_point_d = Subsampling_dynamic_kernel::Point_d; -using Subsampling_ft = Subsampling_dynamic_kernel::FT; // ------ choose_n_farthest_points ------ std::vector<std::vector<double>> subsampling_n_farthest_points(const std::vector<std::vector<double>>& points, unsigned nb_points) { std::vector<std::vector<double>> landmarks; - Subsampling_dynamic_kernel k; - choose_n_farthest_points(k, points, nb_points, random_starting_point, std::back_inserter(landmarks)); + choose_n_farthest_points(Euclidean_distance(), points, nb_points, + random_starting_point, std::back_inserter(landmarks)); return landmarks; } @@ -42,8 +42,8 @@ std::vector<std::vector<double>> subsampling_n_farthest_points(const std::vector std::vector<std::vector<double>> subsampling_n_farthest_points(const std::vector<std::vector<double>>& points, unsigned nb_points, unsigned starting_point) { std::vector<std::vector<double>> landmarks; - Subsampling_dynamic_kernel k; - choose_n_farthest_points(k, points, nb_points, starting_point, std::back_inserter(landmarks)); + choose_n_farthest_points(Euclidean_distance(), points, nb_points, + starting_point, std::back_inserter(landmarks)); return landmarks; } |