diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-11-17 18:55:21 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-11-17 18:55:21 +0000 |
| commit | d93969cc7fc9bca771226caae19d72e9e56ad7eb (patch) | |
| tree | aae511699ccd363fd5564338ae4509d435733373 /src/Witness_complex/include | |
| parent | d043d1fbff7030e3a466f46e364d96ed0dee4ce7 (diff) | |
| parent | ede6f875e8340fb72d114ad9db3b54862566594f (diff) | |
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
Diffstat (limited to 'src/Witness_complex/include')
| -rw-r--r-- | src/Witness_complex/include/gudhi/Construct_closest_landmark_table.h | 8 | ||||
| -rw-r--r-- | src/Witness_complex/include/gudhi/Witness_complex.h | 1 |
2 files changed, 5 insertions, 4 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..1ae2e393 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<FiltrationValue>(points[points_i], *landmarks_it), + landmarks_i); l_heap.push(dist); } for (int i = 0; i < dim + 1; i++) { diff --git a/src/Witness_complex/include/gudhi/Witness_complex.h b/src/Witness_complex/include/gudhi/Witness_complex.h index 489cdf11..1eb126f1 100644 --- a/src/Witness_complex/include/gudhi/Witness_complex.h +++ b/src/Witness_complex/include/gudhi/Witness_complex.h @@ -72,7 +72,6 @@ class Witness_complex { typedef std::vector< Point_t > Point_Vector; typedef std::vector< Vertex_handle > typeVectorVertex; - typedef std::pair< typeVectorVertex, Filtration_value> typeSimplex; typedef std::pair< Simplex_handle, bool > typePairSimplexBool; typedef int Witness_id; |