diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-24 09:34:04 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-24 09:34:04 +0000 |
| commit | be37aaeadc31ed10ede53393237d939d4aa47c82 (patch) | |
| tree | 6b990088ce68cc19b3db1b8789eab831e62dc747 /src/Witness_complex/include/gudhi/Construct_closest_landmark_table.h | |
| parent | 30a66f9431d059eed620e0535583e914fa5a3c74 (diff) | |
| parent | cd9d7681e06f29a25cf5775a384ac2e07e34abe9 (diff) | |
Merge last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@1989 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 0743b9beb802b839357ecce17e11af5d4ef2a163
Diffstat (limited to 'src/Witness_complex/include/gudhi/Construct_closest_landmark_table.h')
| -rw-r--r-- | src/Witness_complex/include/gudhi/Construct_closest_landmark_table.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Witness_complex/include/gudhi/Construct_closest_landmark_table.h b/src/Witness_complex/include/gudhi/Construct_closest_landmark_table.h index ef711c34..a8cdd096 100644 --- a/src/Witness_complex/include/gudhi/Construct_closest_landmark_table.h +++ b/src/Witness_complex/include/gudhi/Construct_closest_landmark_table.h @@ -4,7 +4,7 @@ * * Author(s): Siargey Kachanovich * - * Copyright (C) 2015 INRIA Sophia Antipolis-Méditerranée (France) + * Copyright (C) 2015 INRIA * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -51,7 +51,8 @@ namespace witness_complex { * Closest_landmark_range needs to have push_back operation. */ - template <typename WitnessContainer, + template <typename FiltrationValue, + typename WitnessContainer, typename LandmarkContainer, typename KNearestNeighbours> void construct_closest_landmark_table(WitnessContainer const &points, @@ -72,7 +73,8 @@ namespace witness_complex { int landmarks_i = 0; for (landmarks_it = landmarks.begin(), landmarks_i = 0; landmarks_it != landmarks.end(); ++landmarks_it, landmarks_i++) { - dist_i dist = std::make_pair(euclidean_distance(points[points_i], *landmarks_it), landmarks_i); + dist_i dist = std::make_pair(Euclidean_distance()(points[points_i], *landmarks_it), + landmarks_i); l_heap.push(dist); } for (int i = 0; i < dim + 1; i++) { |