Merge persistence diagram improvement branch

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@2614 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: eaccfe6c60c4a05bbec173a1042db7ad490a9f37

1 files changed, 10 insertions, 3 deletions

diff --git a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h
index 672fda48..e0a147b3 100644
--- a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h
+++ b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h
@@ -591,10 +591,17 @@ class Persistent_cohomology {
     std::ofstream diagram_out(diagram_name.c_str());
     cmp_intervals_by_length cmp(cpx_);
     std::sort(std::begin(persistent_pairs_), std::end(persistent_pairs_), cmp);
+    bool has_infinity = std::numeric_limits<Filtration_value>::has_infinity;
     for (auto pair : persistent_pairs_) {
-    diagram_out << cpx_->dimension(get<0>(pair)) << " "
-          << cpx_->filtration(get<0>(pair)) << " "
-          << cpx_->filtration(get<1>(pair)) << std::endl;
+      // Special case on windows, inf is "1.#INF"
+      if (has_infinity && cpx_->filtration(get<1>(pair)) == std::numeric_limits<Filtration_value>::infinity()) {
+        diagram_out << cpx_->dimension(get<0>(pair)) << " "
+              << cpx_->filtration(get<0>(pair)) << " inf" << std::endl;
+      } else {
+        diagram_out << cpx_->dimension(get<0>(pair)) << " "
+              << cpx_->filtration(get<0>(pair)) << " "
+              << cpx_->filtration(get<1>(pair)) << std::endl;
+      }
     }
   }