Code review: rename Flag_complex_sparse_matrix as edge_collapser and filtered_edge_collapse method as process_edges

2 files changed, 11 insertions, 11 deletions

diff --git a/src/Collapse/example/edge_collapse_basic_example.cpp b/src/Collapse/example/edge_collapse_basic_example.cpp
index a154c6bb..333bc231 100644
--- a/src/Collapse/example/edge_collapse_basic_example.cpp
+++ b/src/Collapse/example/edge_collapse_basic_example.cpp
@@ -1,4 +1,4 @@
-#include <gudhi/Flag_complex_sparse_matrix.h>
+#include <gudhi/Flag_complex_edge_collapser.h>
 
 #include <iostream>
 #include <vector>
@@ -7,10 +7,10 @@ int main() {
   // Type definitions
   using Filtration_value = float;
   using Vertex_handle = short;
-  using Flag_complex_sparse_matrix = Gudhi::collapse::Flag_complex_sparse_matrix<Vertex_handle, Filtration_value>;
-  using Filtered_edge = Flag_complex_sparse_matrix::Filtered_edge;
+  using Flag_complex_edge_collapser = Gudhi::collapse::Flag_complex_edge_collapser<Vertex_handle, Filtration_value>;
+  using Filtered_edge = Flag_complex_edge_collapser::Filtered_edge;
   using Filtered_edge_list = std::vector<Filtered_edge>;
-  using Edge = Flag_complex_sparse_matrix::Edge;
+  using Edge = Flag_complex_edge_collapser::Edge;
 
   //  1   2
   //  o---o
@@ -26,11 +26,11 @@ int main() {
                               {{0, 2}, 2.},
                               {{1, 3}, 2.}};
 
-  Flag_complex_sparse_matrix flag_complex_sparse_matrix(graph);
+  Flag_complex_edge_collapser edge_collapser(graph);
 
   Filtered_edge_list collapse_edges;
   // Retrieve collapse edges from the output iterator
-  flag_complex_sparse_matrix.filtered_edge_collapse(
+  edge_collapser.process_edges(
     [&collapse_edges](std::pair<Vertex_handle, Vertex_handle> edge, Filtration_value filtration) {
         collapse_edges.push_back({edge, filtration});
       });
diff --git a/src/Collapse/example/edge_collapse_conserve_persistence.cpp b/src/Collapse/example/edge_collapse_conserve_persistence.cpp
index 9c561efc..701ea1af 100644
--- a/src/Collapse/example/edge_collapse_conserve_persistence.cpp
+++ b/src/Collapse/example/edge_collapse_conserve_persistence.cpp
@@ -8,7 +8,7 @@
  *      - YYYY/MM Author: Description of the modification
  */
 
-#include <gudhi/Flag_complex_sparse_matrix.h>
+#include <gudhi/Flag_complex_edge_collapser.h>
 #include <gudhi/Simplex_tree.h>
 #include <gudhi/Persistent_cohomology.h>
 #include <gudhi/distance_functions.h>
@@ -27,8 +27,8 @@ using Vertex_handle = Simplex_tree::Vertex_handle;
 using Point = std::vector<Filtration_value>;
 using Vector_of_points = std::vector<Point>;
 
-using Flag_complex_sparse_matrix = Gudhi::collapse::Flag_complex_sparse_matrix<Vertex_handle, Filtration_value>;
-using Proximity_graph = Flag_complex_sparse_matrix::Proximity_graph;
+using Flag_complex_edge_collapser = Gudhi::collapse::Flag_complex_edge_collapser<Vertex_handle, Filtration_value>;
+using Proximity_graph = Flag_complex_edge_collapser::Proximity_graph;
 
 using Field_Zp = Gudhi::persistent_cohomology::Field_Zp;
 using Persistent_cohomology = Gudhi::persistent_cohomology::Persistent_cohomology<Simplex_tree, Field_Zp>;
@@ -112,14 +112,14 @@ int main(int argc, char* argv[]) {
   int ambient_dim = point_vector[0].size();
 
   // ***** Simplex tree from a flag complex built after collapse *****
-  Flag_complex_sparse_matrix mat_filt_edge_coll(proximity_graph);
+  Flag_complex_edge_collapser edge_collapser(proximity_graph);
 
   Simplex_tree stree_from_collapse;
   for (Vertex_handle vertex = 0; static_cast<std::size_t>(vertex) < point_vector.size(); vertex++) {
         // insert the vertex with a 0. filtration value just like a Rips
         stree_from_collapse.insert_simplex({vertex}, 0.);
   }
-  mat_filt_edge_coll.filtered_edge_collapse(
+  edge_collapser.process_edges(
     [&stree_from_collapse](const std::vector<Vertex_handle>& edge, Filtration_value filtration) {
         // insert the edge
         stree_from_collapse.insert_simplex(edge, filtration);