Remove interface with boost graphs and use boost transform for data from graphs

2 files changed, 10 insertions, 2 deletions

diff --git a/src/Collapse/example/edge_collapse_basic_example.cpp b/src/Collapse/example/edge_collapse_basic_example.cpp
index 8e7ca3b1..69ce329e 100644
--- a/src/Collapse/example/edge_collapse_basic_example.cpp
+++ b/src/Collapse/example/edge_collapse_basic_example.cpp
@@ -25,7 +25,7 @@ int main() {
                               {0, 2, 2.},
                               {1, 3, 2.}};
 
-  Flag_complex_edge_collapser edge_collapser(graph.begin(), graph.end());
+  Flag_complex_edge_collapser edge_collapser(graph);
 
   Filtered_edge_list remaining_edges;
   // Retrieve collapse edges from the output iterator
diff --git a/src/Collapse/example/edge_collapse_conserve_persistence.cpp b/src/Collapse/example/edge_collapse_conserve_persistence.cpp
index d78a4d54..e6672d25 100644
--- a/src/Collapse/example/edge_collapse_conserve_persistence.cpp
+++ b/src/Collapse/example/edge_collapse_conserve_persistence.cpp
@@ -15,6 +15,8 @@
 #include <gudhi/Points_off_io.h>
 #include <gudhi/graph_simplicial_complex.h>
 
+#include <boost/range/adaptor/transformed.hpp>
+
 #include<utility>  // for std::pair
 #include<vector>
 #include<tuple>
@@ -109,7 +111,13 @@ int main(int argc, char* argv[]) {
   int ambient_dim = point_vector[0].size();
 
   // ***** Simplex tree from a flag complex built after collapse *****
-  Flag_complex_edge_collapser edge_collapser(proximity_graph);
+  Flag_complex_edge_collapser edge_collapser(
+    boost::adaptors::transform(edges(proximity_graph), [&](auto&&edge){
+      return std::make_tuple(source(edge, proximity_graph),
+                             target(edge, proximity_graph),
+                             get(Gudhi::edge_filtration_t(), proximity_graph, edge));
+      })
+  );
 
   Simplex_tree stree_from_collapse;
   for (Vertex_handle vertex = 0; static_cast<std::size_t>(vertex) < point_vector.size(); vertex++) {