summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfgodi <fgodi@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2016-12-15 16:57:53 +0000
committerfgodi <fgodi@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2016-12-15 16:57:53 +0000
commitb93ea27ea392f49f85deee23526c9330a716093b (patch)
treea3cc37ef8f011460a863c3f4a3ec8ad7bc017ccf
parent07db62d323a2dabdc86ad6f1eb8edbc7b1bf26bb (diff)
cancel commit of temporary testing code
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bottleneck_integration@1886 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 03f3e6515fd74fd2ae8d1de6b7febb4af7607fb5
-rw-r--r--src/Bottleneck_distance/include/gudhi/Bottleneck.h2
-rw-r--r--src/Bottleneck_distance/test/bottleneck_chrono.cpp1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/Bottleneck_distance/include/gudhi/Bottleneck.h b/src/Bottleneck_distance/include/gudhi/Bottleneck.h
index bb1d6d38..24a31ac1 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 (idmax - idmin > epsilon) {
+ while (idmin != idmax) {
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 7a440aeb..dcf98460 100644
--- a/src/Bottleneck_distance/test/bottleneck_chrono.cpp
+++ b/src/Bottleneck_distance/test/bottleneck_chrono.cpp
@@ -51,7 +51,6 @@ 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);