From 66c657a9b422474a1a151fea2ba711b377dce57f Mon Sep 17 00:00:00 2001 From: fgodi Date: Fri, 16 Dec 2016 12:19:22 +0000 Subject: modifs done git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bottleneck_integration@1897 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: f1c2ac9389d5da7556a5c47e90c68572ae97450b --- src/Bottleneck_distance/include/gudhi/Bottleneck.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src/Bottleneck_distance/include') diff --git a/src/Bottleneck_distance/include/gudhi/Bottleneck.h b/src/Bottleneck_distance/include/gudhi/Bottleneck.h index c34ea933..d7e11a05 100644 --- a/src/Bottleneck_distance/include/gudhi/Bottleneck.h +++ b/src/Bottleneck_distance/include/gudhi/Bottleneck.h @@ -34,6 +34,12 @@ double bottleneck_distance_approx(Persistence_graph& g, double e) { double b_lower_bound = 0.; double b_upper_bound = g.diameter_bound(); const double alpha = std::pow(g.size(), 1./5.); + if(e < std::numeric_limits::epsilon() * alpha){ + e = std::numeric_limits::epsilon() * alpha; +#ifdef DEBUG_TRACES + std::cout << "Epsilon user given value is less than eps_min. Forced to eps_min by the application" << std::endl; +#endif // DEBUG_TRACES + } Graph_matching m(g); Graph_matching biggest_unperfect(g); while (b_upper_bound - b_lower_bound > 2*e) { @@ -73,18 +79,18 @@ double bottleneck_distance_exact(Persistence_graph& g) { return sd.at(lower_bound_i); } -/** \brief Function to use in order to compute the Bottleneck distance between two persistence diagrams (see Concepts). - * If the last parameter e is not 0 (default value if not explicited), you get an additive e-approximation. +/** \brief Function to use in order to compute the Bottleneck distance between two persistence diagrams (see concepts). + * If the last parameter e is not 0, you get an additive e-approximation, which is a lot faster to compute whatever is e. + * Thus, by default, e is a very small positive double, actually the smallest double possible such that the floating-point inaccuracies don't lead to a failure of the algorithm. * * \ingroup bottleneck_distance */ template -double bottleneck_distance(const Persistence_diagram1 &diag1, const Persistence_diagram2 &diag2, double e=0.) { +double bottleneck_distance(const Persistence_diagram1 &diag1, const Persistence_diagram2 &diag2, double e=std::numeric_limits::epsilon()) { Persistence_graph g(diag1, diag2, e); if(g.bottleneck_alive() == std::numeric_limits::infinity()) return std::numeric_limits::infinity(); - double b = (e == 0. ? bottleneck_distance_exact(g) : bottleneck_distance_approx(g, e)); - return std::max(g.bottleneck_alive(),b); + return std::max(g.bottleneck_alive(), e == 0. ? bottleneck_distance_exact(g) : bottleneck_distance_approx(g, e)); } } // namespace persistence_diagram -- cgit v1.2.3