From 8ccc304db8b118466dff3c3068f6884ba198dc97 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Fri, 26 Jun 2020 19:02:56 +0200 Subject: Use free functions for tests and examples --- .../example/edge_collapse_conserve_persistence.cpp | 18 +++---- src/Collapse/test/collapse_unit_test.cpp | 58 ++++++++++------------ 2 files changed, 33 insertions(+), 43 deletions(-) (limited to 'src/Collapse') diff --git a/src/Collapse/example/edge_collapse_conserve_persistence.cpp b/src/Collapse/example/edge_collapse_conserve_persistence.cpp index e6672d25..b2c55e7a 100644 --- a/src/Collapse/example/edge_collapse_conserve_persistence.cpp +++ b/src/Collapse/example/edge_collapse_conserve_persistence.cpp @@ -29,8 +29,7 @@ using Vertex_handle = Simplex_tree::Vertex_handle; using Point = std::vector; using Vector_of_points = std::vector; -using Flag_complex_edge_collapser = Gudhi::collapse::Flag_complex_edge_collapser; -using Proximity_graph = Gudhi::Proximity_graph; +using Proximity_graph = Gudhi::Proximity_graph; using Field_Zp = Gudhi::persistent_cohomology::Field_Zp; using Persistent_cohomology = Gudhi::persistent_cohomology::Persistent_cohomology; @@ -111,10 +110,10 @@ 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( + auto remaining_edges = Gudhi::collapse::flag_complex_collapse_edges( boost::adaptors::transform(edges(proximity_graph), [&](auto&&edge){ - return std::make_tuple(source(edge, proximity_graph), - target(edge, proximity_graph), + return std::make_tuple(static_cast(source(edge, proximity_graph)), + static_cast(target(edge, proximity_graph)), get(Gudhi::edge_filtration_t(), proximity_graph, edge)); }) ); @@ -124,11 +123,10 @@ int main(int argc, char* argv[]) { // insert the vertex with a 0. filtration value just like a Rips stree_from_collapse.insert_simplex({vertex}, 0.); } - edge_collapser.process_edges( - [&stree_from_collapse](Vertex_handle u, Vertex_handle v, Filtration_value filtration) { - // insert the edge - stree_from_collapse.insert_simplex({u, v}, filtration); - }); + for (auto remaining_edge : remaining_edges) { + stree_from_collapse.insert_simplex({std::get<0>(remaining_edge), std::get<1>(remaining_edge)}, + std::get<2>(remaining_edge)); + } std::vector persistence_intervals_from_collapse = get_persistence_intervals(stree_from_collapse, ambient_dim); diff --git a/src/Collapse/test/collapse_unit_test.cpp b/src/Collapse/test/collapse_unit_test.cpp index b5ad09c5..b8876246 100644 --- a/src/Collapse/test/collapse_unit_test.cpp +++ b/src/Collapse/test/collapse_unit_test.cpp @@ -25,10 +25,14 @@ #include #include -using Filtration_value = float; -using Vertex_handle = short; -using Flag_complex_edge_collapser = Gudhi::collapse::Flag_complex_edge_collapser; -using Filtered_edge = Flag_complex_edge_collapser::Filtered_edge; +struct Simplicial_complex { + using Vertex_handle = short; + using Filtration_value = float; +}; + +using Vertex_handle = Simplicial_complex::Vertex_handle; +using Filtration_value = Simplicial_complex::Filtration_value; +using Filtered_edge = std::tuple; using Filtered_edge_list = std::vector; template @@ -50,13 +54,8 @@ void trace_and_check_collapse(const Filtered_edge_range& filtered_edges, const F } std::cout << "COLLAPSE - keep edges: " << std::endl; - Flag_complex_edge_collapser edge_collapser(filtered_edges); - Filtered_edge_list remaining_edges; - edge_collapser.process_edges( - [&remaining_edges](Vertex_handle u, Vertex_handle v, Filtration_value filtration) { - std::cout << "f[" << u << ", " << v << "] = " << filtration << std::endl; - remaining_edges.emplace_back(u, v, filtration); - }); + auto remaining_edges = Gudhi::collapse::flag_complex_collapse_edges(filtered_edges); + std::cout << "AFTER COLLAPSE - Total number of edges: " << remaining_edges.size() << std::endl; BOOST_CHECK(remaining_edges.size() <= filtered_edges.size()); for (auto filtered_edge_from_collapse : remaining_edges) { @@ -155,7 +154,6 @@ BOOST_AUTO_TEST_CASE(collapse_from_array) { trace_and_check_collapse(f_edge_array, {{1, 3, 2.}}); } - BOOST_AUTO_TEST_CASE(collapse_from_proximity_graph) { std::cout << "***** COLLAPSE FROM PROXIMITY GRAPH *****" << std::endl; // 1 2 @@ -166,30 +164,24 @@ BOOST_AUTO_TEST_CASE(collapse_from_proximity_graph) { // o---o // 0 3 std::vector> point_cloud = {{0., 0.}, - {0., 1.}, - {1., 0.}, - {1., 1.} }; + {0., 1.}, + {1., 0.}, + {1., 1.} }; Filtration_value threshold = std::numeric_limits::infinity(); - using Proximity_graph = Gudhi::Proximity_graph; - Proximity_graph proximity_graph = Gudhi::compute_proximity_graph(point_cloud, - threshold, - Gudhi::Euclidean_distance()); - - 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)); + using Proximity_graph = Gudhi::Proximity_graph; + Proximity_graph proximity_graph = Gudhi::compute_proximity_graph(point_cloud, + threshold, + Gudhi::Euclidean_distance()); + + auto remaining_edges = Gudhi::collapse::flag_complex_collapse_edges( + boost::adaptors::transform(edges(proximity_graph), [&](auto&&edge){ + return std::make_tuple(static_cast(source(edge, proximity_graph)), + static_cast(target(edge, proximity_graph)), + get(Gudhi::edge_filtration_t(), proximity_graph, edge)); }) - ); - - Filtered_edge_list remaining_edges; - edge_collapser.process_edges( - [&remaining_edges](Vertex_handle u, Vertex_handle v, Filtration_value filtration) { - std::cout << "f[" << u << ", " << v << "] = " << filtration << std::endl; - remaining_edges.emplace_back(u, v, filtration); - }); + ); + BOOST_CHECK(remaining_edges.size() == 5); std::size_t filtration_is_edge_length_nb = 0; -- cgit v1.2.3