Merged latest trunk changes to my_branch and fix

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

Former-commit-id: 2463ee9b0f8b69e3edbda4e8189eb61606e0af93

1 files changed, 14 insertions, 4 deletions

diff --git a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h
index b5d8003f..bf8c65b9 100644
--- a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h
+++ b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h
@@ -222,11 +222,8 @@ class Persistent_cohomology {
 
   /** \brief Initializes the Persistent_cohomology class.
    *
-   * @param[in] cpx Complex for which the persistent homology is compiuted.
+   * @param[in] cpx Complex for which the persistent homology is computed.
    cpx is a model of FilteredComplex
-   *
-   * @param[in] persistence_dim_max if true, the persistent homology for the maximal dimension in the
-   *                                complex is computed. If false, it is ignored. Default is false.
    */
   explicit Persistent_cohomology(Complex_ds& cpx)
       : cpx_(&cpx),
@@ -708,6 +705,19 @@ class Persistent_cohomology {
     }
   }
 
+  void write_output_diagram(std::string diagram_name)
+  {
+    std::ofstream           diagram_out(diagram_name.c_str());
+    cmp_intervals_by_length cmp( cpx_ );
+    persistent_pairs_.sort( cmp );
+    for(auto pair : persistent_pairs_)
+    {
+    diagram_out << cpx_->dimension(get<0>(pair)) << " "
+          << cpx_->filtration(get<0>(pair)) << " "
+          << cpx_->filtration(get<1>(pair)) << std::endl;
+    }
+  }
+
  private:
   /*
    * Structure representing a cocycle.