From d0db67f8ff185a7698d2f6643d86e43955bab882 Mon Sep 17 00:00:00 2001 From: fgodi Date: Tue, 6 Dec 2016 16:20:10 +0000 Subject: infinite points separately computed git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bottleneck_integration@1828 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 5d1cd63a1b8ff26feffce86a4febe2f42d52340d --- src/Bottleneck_distance/concept/Persistence_diagram.h | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'src/Bottleneck_distance/concept') diff --git a/src/Bottleneck_distance/concept/Persistence_diagram.h b/src/Bottleneck_distance/concept/Persistence_diagram.h index d55f5573..e4766628 100644 --- a/src/Bottleneck_distance/concept/Persistence_diagram.h +++ b/src/Bottleneck_distance/concept/Persistence_diagram.h @@ -27,24 +27,20 @@ namespace Gudhi { namespace bottleneck_distance { -/** \brief Concept of Diagram_point. get<0>() must return the birth of the corresponding component and get<1>() its death. - * If the component stay alive, get<1>() must return std::numeric_limits::infinity(). +/** \brief Concept of Diagram_point. std::get<0>(point) must return the birth of the corresponding component and std::get<1>(point) its death. + * A valid implementation of this concept is std::pair. + * Birth must be 0 or positive, death should be larger than birth, death can be std::numeric_limits::infinity() for components which stay alive. * * \ingroup bottleneck_distance */ -struct Diagram_point{ - double get(); -}; +struct Diagram_point; /** \brief Concept of persistence diagram. It's a range of Diagram_point. + * std::begin(diagram) and std::end(diagram) must return corresponding iterators. * * \ingroup bottleneck_distance */ -struct Persistence_Diagram -{ - iterator begin(); - iterator end(); -}; +struct Persistence_Diagram; } // namespace bottleneck_distance -- cgit v1.2.3