diff options
| author | mcarrier <mcarrier@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-05-16 08:16:49 +0000 |
|---|---|---|
| committer | mcarrier <mcarrier@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-05-16 08:16:49 +0000 |
| commit | 5a78c67dafc7a664d9b3c248bf2781c770393c68 (patch) | |
| tree | a33408af4abedf120df65cb0b4f17d0cd3a26dd1 /src/Bottleneck_distance/include/gudhi/Bottleneck.h | |
| parent | cce99f5f66d0eb4da5a12b145c29579cf7656185 (diff) | |
| parent | 044c3fbd3634871805bc130dcad8f08ecd510784 (diff) | |
Merged latest trunk changes to Nerve_GIC
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/Nerve_GIC@2431 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 866ddfadee8160dfaa46b8d703fd8d8d4476892a
Diffstat (limited to 'src/Bottleneck_distance/include/gudhi/Bottleneck.h')
| -rw-r--r-- | src/Bottleneck_distance/include/gudhi/Bottleneck.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Bottleneck_distance/include/gudhi/Bottleneck.h b/src/Bottleneck_distance/include/gudhi/Bottleneck.h index b90a0ee0..8c97dce9 100644 --- a/src/Bottleneck_distance/include/gudhi/Bottleneck.h +++ b/src/Bottleneck_distance/include/gudhi/Bottleneck.h @@ -101,11 +101,11 @@ double bottleneck_distance_exact(Persistence_graph& g) { */ template<typename Persistence_diagram1, typename Persistence_diagram2> double bottleneck_distance(const Persistence_diagram1 &diag1, const Persistence_diagram2 &diag2, - double e = std::numeric_limits<double>::min()) { + double e = (std::numeric_limits<double>::min)()) { Persistence_graph g(diag1, diag2, e); if (g.bottleneck_alive() == std::numeric_limits<double>::infinity()) return std::numeric_limits<double>::infinity(); - return std::max(g.bottleneck_alive(), e == 0. ? bottleneck_distance_exact(g) : bottleneck_distance_approx(g, e)); + return (std::max)(g.bottleneck_alive(), e == 0. ? bottleneck_distance_exact(g) : bottleneck_distance_approx(g, e)); } } // namespace persistence_diagram |