Merge last trunk modifications

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

Former-commit-id: 1f02e2f3b3e716d6578be49437e7d0b33fa99e5b

1 files changed, 27 insertions, 1 deletions

diff --git a/src/cython/include/Persistent_cohomology_interface.h b/src/cython/include/Persistent_cohomology_interface.h
index 55028fd0..8cf71a4e 100644
--- a/src/cython/include/Persistent_cohomology_interface.h
+++ b/src/cython/include/Persistent_cohomology_interface.h
@@ -4,7 +4,7 @@
  *
  *    Author(s):       Vincent Rouvreau
  *
- *    Copyright (C) 2016 INRIA
+ *    Copyright (C) 2016 Inria
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
@@ -85,6 +85,32 @@ persistent_cohomology::Persistent_cohomology<FilteredComplex, persistent_cohomol
     return persistence;
   }
 
+  std::vector<std::pair<std::vector<int>, std::vector<int>>> persistence_pairs() {
+    auto pairs = persistent_cohomology::Persistent_cohomology<FilteredComplex,
+      persistent_cohomology::Field_Zp>::get_persistent_pairs();
+
+    std::vector<std::pair<std::vector<int>, std::vector<int>>> persistence_pairs;
+    persistence_pairs.reserve(pairs.size());
+    for (auto pair : pairs) {
+      std::vector<int> birth;
+      if (get<0>(pair) != stptr_->null_simplex()) {
+        for (auto vertex : stptr_->simplex_vertex_range(get<0>(pair))) {
+          birth.push_back(vertex);
+        }
+      }
+
+      std::vector<int> death;
+      if (get<1>(pair) != stptr_->null_simplex()) {
+        for (auto vertex : stptr_->simplex_vertex_range(get<1>(pair))) {
+          death.push_back(vertex);
+        }
+      }
+
+      persistence_pairs.push_back(std::make_pair(birth, death));
+    }
+    return persistence_pairs;
+  }
+
  private:
   // A copy
   FilteredComplex* stptr_;