diff options
author | fgodi <fgodi@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-12-15 16:51:19 +0000 |
---|---|---|
committer | fgodi <fgodi@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-12-15 16:51:19 +0000 |
commit | 07db62d323a2dabdc86ad6f1eb8edbc7b1bf26bb (patch) | |
tree | e220d177d5bb8b8bb0340ab81866d7fadae8d32f /src | |
parent | 93c82310194d5fc28979e86287f15dacddbaa5ba (diff) |
small modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bottleneck_integration@1885 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 111fc4e381223fc2d4b6e6c71b61dd1552c7cc95
Diffstat (limited to 'src')
-rw-r--r-- | src/Bottleneck_distance/include/gudhi/Bottleneck.h | 2 | ||||
-rw-r--r-- | src/Bottleneck_distance/test/bottleneck_chrono.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/Bottleneck_distance/include/gudhi/Bottleneck.h b/src/Bottleneck_distance/include/gudhi/Bottleneck.h index 24a31ac1..bb1d6d38 100644 --- a/src/Bottleneck_distance/include/gudhi/Bottleneck.h +++ b/src/Bottleneck_distance/include/gudhi/Bottleneck.h @@ -49,7 +49,7 @@ double bottleneck_distance(const Persistence_diagram1 &diag1, const Persistence_ double alpha = std::pow(g.size(), 1./5.); Graph_matching m(g); Graph_matching biggest_unperfect(g); - while (idmin != idmax) { + while (idmax - idmin > epsilon) { long step = static_cast<long>((idmax - idmin - 1)/alpha); m.set_r(e == 0. ? sd.at(idmin + step) : e*(idmin + step)); while (m.multi_augment()); diff --git a/src/Bottleneck_distance/test/bottleneck_chrono.cpp b/src/Bottleneck_distance/test/bottleneck_chrono.cpp index dcf98460..7a440aeb 100644 --- a/src/Bottleneck_distance/test/bottleneck_chrono.cpp +++ b/src/Bottleneck_distance/test/bottleneck_chrono.cpp @@ -51,6 +51,7 @@ int main(){ if(i%3==0) v2.emplace_back(std::max(a,b),std::max(a,b)+y); } + std::cout << std::numeric_limits<double>::max() / std::numeric_limits<double>::min() << std::endl; double epsilon = 0.0000000000000001; std::chrono::steady_clock::time_point start = std::chrono::steady_clock::now(); double b = bottleneck_distance(v1,v2, epsilon); |