diff options
author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-06-04 16:39:24 +0200 |
---|---|---|
committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-06-04 16:39:24 +0200 |
commit | a106902b9f52115ec481029df194dffc4685e2ca (patch) | |
tree | f66caa346374a1d45d2c2cf35ff78c111e162239 /src/Collapse/utilities | |
parent | 52fe5b2c6841dc15000896c60e0d6a12591bdc29 (diff) |
Fix tests and utils
Diffstat (limited to 'src/Collapse/utilities')
-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 | 6 |
2 files changed, 9 insertions, 1 deletions
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 f39e9764..1ac017c2 100644 --- a/src/Collapse/utilities/distance_matrix_edge_collapse_rips_persistence.cpp +++ b/src/Collapse/utilities/distance_matrix_edge_collapse_rips_persistence.cpp @@ -93,6 +93,10 @@ int main(int argc, char* argv[]) { Flag_complex_sparse_matrix flag_complex(proximity_graph); Simplex_tree stree; + for (Vertex_handle vertex = 0; vertex < distances.size(); vertex++) { + // insert the vertex with a 0. filtration value just like a Rips + stree.insert_simplex({vertex}, 0.); + } flag_complex.filtered_edge_collapse( [&stree](std::vector<Vertex_handle> edge, Filtration_value filtration) { // insert the 2 vertices with a 0. filtration value just like a Rips 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 067b29e3..9624d516 100644 --- a/src/Collapse/utilities/point_cloud_edge_collapse_rips_persistence.cpp +++ b/src/Collapse/utilities/point_cloud_edge_collapse_rips_persistence.cpp @@ -68,7 +68,7 @@ int main(int argc, char* argv[]) { std::cout << "Successfully read " << point_vector.size() << " point_vector.\n"; std::cout << "Ambient dimension is " << point_vector[0].size() << ".\n"; - Proximity_graph proximity_graph = Gudhi::compute_proximity_graph<Simplex_tree>(off_reader.get_point_cloud(), + Proximity_graph proximity_graph = Gudhi::compute_proximity_graph<Simplex_tree>(point_vector, threshold, Gudhi::Euclidean_distance()); @@ -80,6 +80,10 @@ int main(int argc, char* argv[]) { Flag_complex_sparse_matrix mat_filt_edge_coll(proximity_graph); Simplex_tree stree; + for (Vertex_handle vertex = 0; vertex < point_vector.size(); vertex++) { + // insert the vertex with a 0. filtration value just like a Rips + stree.insert_simplex({vertex}, 0.); + } mat_filt_edge_coll.filtered_edge_collapse( [&stree](const std::vector<Vertex_handle>& edge, Filtration_value filtration) { // insert the 2 vertices with a 0. filtration value just like a Rips |