diff options
Diffstat (limited to 'src/common/include')
-rw-r--r-- | src/common/include/gudhi/distance_functions.h | 5 | ||||
-rw-r--r-- | src/common/include/gudhi/reader_utils.h | 2 |
2 files changed, 6 insertions, 1 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 diff --git a/src/common/include/gudhi/reader_utils.h b/src/common/include/gudhi/reader_utils.h index f1684d78..1dc8a547 100644 --- a/src/common/include/gudhi/reader_utils.h +++ b/src/common/include/gudhi/reader_utils.h @@ -25,8 +25,8 @@ #include <gudhi/graph_simplicial_complex.h> #include <gudhi/Debug_utils.h> - #include <boost/function_output_iterator.hpp> + #include <boost/graph/adjacency_list.hpp> #include <iostream> |