From 9654c177078fc598c8a8424dd67d0742bf0defb9 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Thu, 9 Apr 2020 21:46:42 +0200 Subject: Use an output iterator for edge collapse return instead of storing it --- ...tance_matrix_edge_collapse_rips_persistence.cpp | 46 ++++------------- .../point_cloud_edge_collapse_rips_persistence.cpp | 59 ++++++---------------- 2 files changed, 25 insertions(+), 80 deletions(-) (limited to 'src/Collapse/utilities') diff --git a/src/Collapse/utilities/distance_matrix_edge_collapse_rips_persistence.cpp b/src/Collapse/utilities/distance_matrix_edge_collapse_rips_persistence.cpp index 7f5a9454..98a90892 100644 --- a/src/Collapse/utilities/distance_matrix_edge_collapse_rips_persistence.cpp +++ b/src/Collapse/utilities/distance_matrix_edge_collapse_rips_persistence.cpp @@ -1,5 +1,4 @@ #include -#include #include #include #include @@ -17,7 +16,6 @@ using Vector_of_points = std::vector; using Simplex_tree = Gudhi::Simplex_tree; using Filtration_value = double; -using Rips_complex = Gudhi::rips_complex::Rips_complex; using Rips_edge_list = Gudhi::rips_edge_list::Rips_edge_list; using Field_Zp = Gudhi::persistent_cohomology::Field_Zp; using Persistent_cohomology = Gudhi::persistent_cohomology::Persistent_cohomology; @@ -62,32 +60,6 @@ void program_options(int argc, char* const argv[], double& min_persistence, doub } } -class filt_edge_to_dist_matrix { - public: - template - filt_edge_to_dist_matrix(Distance_matrix& distance_mat, Filtered_sorted_edge_list& edge_filt, - std::size_t number_of_points) { - double inf = std::numeric_limits::max(); - doubleVector distances; - std::pair e; - for (std::size_t indx = 0; indx < number_of_points; indx++) { - for (std::size_t j = 0; j <= indx; j++) { - if (j == indx) - distances.push_back(0); - else - distances.push_back(inf); - } - distance_mat.push_back(distances); - distances.clear(); - } - - for (auto edIt = edge_filt.begin(); edIt != edge_filt.end(); edIt++) { - e = std::minmax(std::get<1>(*edIt), std::get<2>(*edIt)); - distance_mat.at(std::get<1>(e)).at(std::get<0>(e)) = std::get<0>(*edIt); - } - } -}; - void program_options(int argc, char* argv[], std::string& csv_matrix_file, std::string& filediag, Filtration_value& threshold, int& dim_max, int& p, Filtration_value& min_persistence); @@ -133,16 +105,18 @@ int main(int argc, char* argv[]) { std::cout << "Filtered edge collapse begins" << std::endl; Flag_complex_sparse_matrix mat_filt_edge_coll(edge_t); std::cout << "Matrix instansiated" << std::endl; - Filtered_sorted_edge_list collapse_edges; - collapse_edges = mat_filt_edge_coll.filtered_edge_collapse(); - filt_edge_to_dist_matrix(sparse_distances, collapse_edges, number_of_points); - std::cout << "Total number of vertices after collapse in the sparse matrix are: " << mat_filt_edge_coll.num_vertices() - << std::endl; - - Rips_complex rips_complex_after_collapse(sparse_distances, threshold); Simplex_tree stree; - rips_complex_after_collapse.create_complex(stree, dim_max); + mat_filt_edge_coll.filtered_edge_collapse( + [&stree](std::vector edge, double filtration) { + // insert the 2 vertices with a 0. filtration value just like a Rips + stree.insert_simplex({edge[0]}, 0.); + stree.insert_simplex({edge[1]}, 0.); + // insert the edge + stree.insert_simplex(edge, filtration); + }); + + stree.expansion(dim_max); std::cout << "The complex contains " << stree.num_simplices() << " simplices after collapse. \n"; std::cout << " and has dimension " << stree.dimension() << " \n"; diff --git a/src/Collapse/utilities/point_cloud_edge_collapse_rips_persistence.cpp b/src/Collapse/utilities/point_cloud_edge_collapse_rips_persistence.cpp index a2840674..70d8d9c5 100644 --- a/src/Collapse/utilities/point_cloud_edge_collapse_rips_persistence.cpp +++ b/src/Collapse/utilities/point_cloud_edge_collapse_rips_persistence.cpp @@ -1,8 +1,6 @@ #include -#include #include #include -#include #include #include #include @@ -11,16 +9,18 @@ #include #include +#include // for std::pair +#include + // Types definition using Simplex_tree = Gudhi::Simplex_tree<>; using Filtration_value = Simplex_tree::Filtration_value; +using Vertex_handle = std::size_t; /*Simplex_tree::Vertex_handle;*/ using Point = std::vector; using Vector_of_points = std::vector; -using Rips_complex = Gudhi::rips_complex::Rips_complex; -using Rips_edge_list = Gudhi::rips_edge_list::Rips_edge_list; using Field_Zp = Gudhi::persistent_cohomology::Field_Zp; using Persistent_cohomology = Gudhi::persistent_cohomology::Persistent_cohomology; using Distance_matrix = std::vector>; @@ -29,38 +29,10 @@ using Adjacency_list = boost::adjacency_list, boost::property>; - -class filt_edge_to_dist_matrix { - public: - template - filt_edge_to_dist_matrix(Distance_matrix& distance_mat, Filtered_sorted_edge_list& edge_filt, - std::size_t number_of_points) { - double inf = std::numeric_limits::max(); - doubleVector distances; - std::pair e; - for (std::size_t indx = 0; indx < number_of_points; indx++) { - for (std::size_t j = 0; j <= indx; j++) { - if (j == indx) - distances.push_back(0); - else - distances.push_back(inf); - } - distance_mat.push_back(distances); - distances.clear(); - } - - for (auto edIt = edge_filt.begin(); edIt != edge_filt.end(); edIt++) { - e = std::minmax(std::get<1>(*edIt), std::get<2>(*edIt)); - distance_mat.at(std::get<1>(e)).at(std::get<0>(e)) = std::get<0>(*edIt); - } - } -}; - void program_options(int argc, char* argv[], std::string& off_file_points, std::string& filediag, Filtration_value& threshold, int& dim_max, int& p, Filtration_value& min_persistence); int main(int argc, char* argv[]) { - typedef size_t Vertex_handle; typedef std::vector> Filtered_sorted_edge_list; auto the_begin = std::chrono::high_resolution_clock::now(); @@ -82,8 +54,6 @@ int main(int argc, char* argv[]) { std::cout << min_persistence << ", " << threshold << ", " << dim_max << ", " << off_file_points << ", " << filediag << std::endl; - Map map_empty; - Distance_matrix sparse_distances; Gudhi::Points_off_reader off_reader(off_file_points); @@ -120,18 +90,19 @@ int main(int argc, char* argv[]) { std::cout << "Computing the one-skeleton for threshold: " << threshold << std::endl; std::cout << "Matrix instansiated" << std::endl; - Filtered_sorted_edge_list collapse_edges; - collapse_edges = mat_filt_edge_coll.filtered_edge_collapse(); - filt_edge_to_dist_matrix(sparse_distances, collapse_edges, number_of_points); - std::cout << "Total number of vertices after collapse in the sparse matrix are: " << mat_filt_edge_coll.num_vertices() - << std::endl; - - // Rips_complex rips_complex_before_collapse(distances, threshold); - Rips_complex rips_complex_after_collapse(sparse_distances, threshold); Simplex_tree stree; - rips_complex_after_collapse.create_complex(stree, dim_max); - + mat_filt_edge_coll.filtered_edge_collapse( + [&stree](std::vector edge, double filtration) { + // insert the 2 vertices with a 0. filtration value just like a Rips + stree.insert_simplex({edge[0]}, 0.); + stree.insert_simplex({edge[1]}, 0.); + // insert the edge + stree.insert_simplex(edge, filtration); + }); + + stree.expansion(dim_max); + std::cout << "The complex contains " << stree.num_simplices() << " simplices after collapse. \n"; std::cout << " and has dimension " << stree.dimension() << " \n"; -- cgit v1.2.3