summaryrefslogtreecommitdiff
path: root/src/common/include
diff options
context:
space:
mode:
authorvrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2017-12-06 09:13:33 +0000
committervrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2017-12-06 09:13:33 +0000
commit223b9334d8e71be1ef1e0279c128201d9faa18f7 (patch)
tree1c70e5f83a8dae753f923af9db18a2dc19bd9795 /src/common/include
parent75d2050ff37aa56fd4c1473bb6ccd8e533b55558 (diff)
parent11c6ce22ef17bb41f484d5f5aeb1acb34b9c28ea (diff)
Merge C++ version of persistence representation
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/persistence_representation_integration_bis@3043 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 6421c7cbe670fad1a8900ccc0ea6ff32297dd5e7
Diffstat (limited to 'src/common/include')
-rw-r--r--src/common/include/gudhi/distance_functions.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/common/include/gudhi/distance_functions.h b/src/common/include/gudhi/distance_functions.h
index f6e2ab5a..c556155e 100644
--- a/src/common/include/gudhi/distance_functions.h
+++ b/src/common/include/gudhi/distance_functions.h
@@ -26,6 +26,7 @@
#include <cmath> // for std::sqrt
#include <type_traits> // for std::decay
#include <iterator> // for std::begin, std::end
+#include <utility>
namespace Gudhi {
@@ -48,6 +49,10 @@ class Euclidean_distance {
}
return std::sqrt(dist);
}
+ template< typename T >
+ T operator() (const std::pair< T, T >& f, const std::pair< T, T >& s) {
+ return sqrt((f.first-s.first)*(f.first-s.first) + (f.second-s.second)*(f.second-s.second));
+ }
};
} // namespace Gudhi