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/common/include/gudhi/distance_functions.h | |
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/common/include/gudhi/distance_functions.h')
-rw-r--r-- | src/common/include/gudhi/distance_functions.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/include/gudhi/distance_functions.h b/src/common/include/gudhi/distance_functions.h index cd518581..006df275 100644 --- a/src/common/include/gudhi/distance_functions.h +++ b/src/common/include/gudhi/distance_functions.h @@ -28,13 +28,13 @@ /* Compute the Euclidean distance between two Points given * by a range of coordinates. The points are assumed to have * the same dimension. */ -template< typename Point > -double euclidean_distance(Point &p1, Point &p2) { - double dist = 0.; +template< typename Filtration_value, typename Point > +Filtration_value euclidean_distance(const Point &p1,const Point &p2) { + Filtration_value dist = 0.; auto it1 = p1.begin(); auto it2 = p2.begin(); for (; it1 != p1.end(); ++it1, ++it2) { - double tmp = *it1 - *it2; + Filtration_value tmp = (double)(*it1) - (double)(*it2); dist += tmp*tmp; } return std::sqrt(dist); |