diff options
Diffstat (limited to 'src/Collapse')
-rw-r--r-- | src/Collapse/include/gudhi/Flag_complex_sparse_matrix.h (renamed from src/Collapse/include/gudhi/FlagComplexSpMatrix.h) | 10 | ||||
-rw-r--r-- | src/Collapse/test/collapse_unit_test.cpp | 4 | ||||
-rw-r--r-- | src/Collapse/utilities/distance_matrix_edge_collapse_rips_persistence.cpp | 4 | ||||
-rw-r--r-- | src/Collapse/utilities/point_cloud_edge_collapse_rips_persistence.cpp | 4 |
4 files changed, 10 insertions, 12 deletions
diff --git a/src/Collapse/include/gudhi/FlagComplexSpMatrix.h b/src/Collapse/include/gudhi/Flag_complex_sparse_matrix.h index 32a6ad5c..7bbe86c4 100644 --- a/src/Collapse/include/gudhi/FlagComplexSpMatrix.h +++ b/src/Collapse/include/gudhi/Flag_complex_sparse_matrix.h @@ -72,7 +72,7 @@ typedef std::unordered_map<Edge, std::size_t, boost::hash<Edge>> u_edge_to_idx_m The class for storing the Vertices v/s MaxSimplices Sparse Matrix and performing collapses operations using the N^2() Algorithm. */ -class FlagComplexSpMatrix { +class Flag_complex_sparse_matrix { private: std::unordered_map<int, Vertex> rowToVertex; @@ -332,7 +332,7 @@ class FlagComplexSpMatrix { <B>vertDomnIndicator</B> ,<B>rowIterator<B> are initialised by init() function which is called at the begining of this. <br> */ - FlagComplexSpMatrix(const size_t& num_vertices, const Filtered_sorted_edge_list& edge_t) + Flag_complex_sparse_matrix(const size_t& num_vertices, const Filtered_sorted_edge_list& edge_t) : rows(0), numOneSimplices(0), edgeCollapsed(false) { @@ -347,15 +347,13 @@ class FlagComplexSpMatrix { // Performs edge collapse in a decreasing sequence of the filtration value. Filtered_sorted_edge_list filtered_edge_collapse() { - std::size_t totEdges = f_edge_vector.size(); - std::size_t endIdx = 0; u_set_removed_redges.clear(); u_set_dominated_redges.clear(); critical_edge_indicator.clear(); - while (endIdx < totEdges) { + while (endIdx < f_edge_vector.size()) { EdgeFilt fec = f_edge_vector[endIdx]; Edge e = std::get<0>(fec); Vertex u = std::get<0>(e); @@ -382,7 +380,7 @@ class FlagComplexSpMatrix { #ifdef DEBUG_TRACES std::cout << "The total number of critical edges is: " << criticalCoreEdges.size() << std::endl; - std::cout << "The total number of non-critical edges is: " << totEdges - criticalCoreEdges.size() << std::endl; + std::cout << "The total number of non-critical edges is: " << f_edge_vector.size() - criticalCoreEdges.size() << std::endl; #endif // DEBUG_TRACES edgeCollapsed = true; return criticalCoreEdges; diff --git a/src/Collapse/test/collapse_unit_test.cpp b/src/Collapse/test/collapse_unit_test.cpp index 427c315e..67f35e89 100644 --- a/src/Collapse/test/collapse_unit_test.cpp +++ b/src/Collapse/test/collapse_unit_test.cpp @@ -25,7 +25,7 @@ // ^ // /!\ Nothing else from Simplex_tree shall be included to test includes are well defined. -#include "gudhi/FlagComplexSpMatrix.h" +#include "gudhi/Flag_complex_sparse_matrix.h" #include "gudhi/Rips_edge_list.h" #include "gudhi/graph_simplicial_complex.h" #include "gudhi/distance_functions.h" @@ -64,7 +64,7 @@ void trace_and_check_collapse(const Filtered_sorted_edge_list& edges, const Filt std::cout << "f[" << std::get<1>(edge) << ", " << std::get<2>(edge) << "] = " << std::get<0>(edge) << std::endl; } - FlagComplexSpMatrix flag_complex_sparse_matrix(5, edges); + Flag_complex_sparse_matrix flag_complex_sparse_matrix(5, edges); auto collapse_edges = flag_complex_sparse_matrix.filtered_edge_collapse(); std::cout << "AFTER COLLAPSE - Total number of edges: " << collapse_edges.size() << std::endl; BOOST_CHECK(collapse_edges.size() <= edges.size()); 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 63c91ebc..75eb6d67 100644 --- a/src/Collapse/utilities/distance_matrix_edge_collapse_rips_persistence.cpp +++ b/src/Collapse/utilities/distance_matrix_edge_collapse_rips_persistence.cpp @@ -1,4 +1,4 @@ -#include <gudhi/FlagComplexSpMatrix.h> +#include <gudhi/Flag_complex_sparse_matrix.h> #include <gudhi/Rips_complex.h> #include <gudhi/Simplex_tree.h> #include <gudhi/Persistent_cohomology.h> @@ -131,7 +131,7 @@ int main(int argc, char* argv[]) { // Now we will perform filtered edge collapse to sparsify the edge list edge_t. std::cout << "Filtered edge collapse begins" << std::endl; - FlagComplexSpMatrix mat_filt_edge_coll(number_of_points, edge_t); + Flag_complex_sparse_matrix mat_filt_edge_coll(number_of_points, edge_t); std::cout << "Matrix instansiated" << std::endl; Filtered_sorted_edge_list collapse_edges; collapse_edges = mat_filt_edge_coll.filtered_edge_collapse(); 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 af08477c..b316391b 100644 --- a/src/Collapse/utilities/point_cloud_edge_collapse_rips_persistence.cpp +++ b/src/Collapse/utilities/point_cloud_edge_collapse_rips_persistence.cpp @@ -1,4 +1,4 @@ -#include <gudhi/FlagComplexSpMatrix.h> +#include <gudhi/Flag_complex_sparse_matrix.h> #include <gudhi/Rips_complex.h> #include <gudhi/Simplex_tree.h> #include <gudhi/Persistent_cohomology.h> @@ -115,7 +115,7 @@ int main(int argc, char* argv[]) { // Now we will perform filtered edge collapse to sparsify the edge list edge_t. std::cout << "Filtered edge collapse begins" << std::endl; - FlagComplexSpMatrix mat_filt_edge_coll(number_of_points, edge_t); + Flag_complex_sparse_matrix mat_filt_edge_coll(number_of_points, edge_t); std::cout << "Matrix instansiated" << std::endl; Filtered_sorted_edge_list collapse_edges; collapse_edges = mat_filt_edge_coll.filtered_edge_collapse(); |