read_persistence_diagram_from_file now uses an output iterator

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

Former-commit-id: 3969666dcde3581a75789c5a4b62817dea553f9f

1 files changed, 13 insertions, 2 deletions

diff --git a/src/Bottleneck_distance/example/bottleneck_read_file_example.cpp b/src/Bottleneck_distance/example/bottleneck_read_file_example.cpp
index 67bd27db..74c8d1ab 100644
--- a/src/Bottleneck_distance/example/bottleneck_read_file_example.cpp
+++ b/src/Bottleneck_distance/example/bottleneck_read_file_example.cpp
@@ -31,14 +31,25 @@
 #include <sstream>
 #include <string>
 
+struct Persistence_interval
+  : std::pair<double, double>
+{
+  Persistence_interval(std::tuple<int, double, double> data)
+    : std::pair<double, double>(std::make_pair(std::get<1>(data), std::get<2>(data)))
+  {}
+};
+
 int main(int argc, char** argv) {
   if (argc < 3) {
     std::cout << "To run this program please provide as an input two files with persistence diagrams. Each file " <<
         "should contain a birth-death pair per line. Third, optional parameter is an error bound on a bottleneck" <<
         " distance (set by default to zero). The program will now terminate \n";
   }
-  std::vector< std::pair< double, double > > diag1 = read_persistence_diagram_from_file(argv[1]);
-  std::vector< std::pair< double, double > > diag2 = read_persistence_diagram_from_file(argv[2]);
+  std::vector<Persistence_interval> diag1;
+  std::vector<Persistence_interval> diag2;
+  read_persistence_diagram_from_file(argv[1], std::back_inserter(diag1));
+  read_persistence_diagram_from_file(argv[2], std::back_inserter(diag2));
+
   double tolerance = 0.;
   if (argc == 4) {
     tolerance = atof(argv[3]);