From 7a5b56ce3960c5981bd507fc379b8f0257d5349a Mon Sep 17 00:00:00 2001 From: Ulrich Bauer Date: Wed, 25 Nov 2020 22:04:10 +0100 Subject: cleanup --- ripser.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/ripser.cpp b/ripser.cpp index cd546e8..301b778 100644 --- a/ripser.cpp +++ b/ripser.cpp @@ -263,9 +263,6 @@ struct sparse_distance_matrix { index_t num_edges; - mutable std::vector::const_reverse_iterator> neighbor_it; - mutable std::vector::const_reverse_iterator> neighbor_end; - sparse_distance_matrix(std::vector>&& _neighbors, index_t _num_edges) : neighbors(std::move(_neighbors)), num_edges(_num_edges) {} @@ -581,8 +578,9 @@ public: template void add_coboundary(compressed_sparse_matrix& reduction_matrix, const std::vector& columns_to_reduce, - const size_t index_column_to_add, const coefficient_t factor, const size_t& dim, - Column& working_reduction_column, Column& working_coboundary) { + const size_t index_column_to_add, const coefficient_t factor, + const size_t& dim, Column& working_reduction_column, + Column& working_coboundary) { diameter_entry_t column_to_add(columns_to_reduce[index_column_to_add], factor); add_simplex_coboundary(column_to_add, dim, working_reduction_column, working_coboundary); @@ -744,8 +742,8 @@ template <> class ripser::simplex_coboundary_enumerator const coefficient_t modulus; const sparse_distance_matrix& dist; const binomial_coeff_table& binomial_coeff; - std::vector::const_reverse_iterator>& neighbor_it; - std::vector::const_reverse_iterator>& neighbor_end; + std::vector::const_reverse_iterator> neighbor_it; + std::vector::const_reverse_iterator> neighbor_end; index_diameter_t neighbor; public: @@ -753,10 +751,7 @@ public: const ripser& _parent) : parent(_parent), idx_below(get_index(_simplex)), idx_above(0), k(_dim + 1), vertices(_dim + 1), simplex(_simplex), modulus(parent.modulus), dist(parent.dist), - binomial_coeff(parent.binomial_coeff), neighbor_it(dist.neighbor_it), - neighbor_end(dist.neighbor_end) { - neighbor_it.clear(); - neighbor_end.clear(); + binomial_coeff(parent.binomial_coeff) { parent.get_simplex_vertices(idx_below, _dim, parent.n, vertices.rbegin()); for (auto v : vertices) { -- cgit v1.2.3 From 320b8248566a3b9108aa5ac7e751ec40d48690ee Mon Sep 17 00:00:00 2001 From: Ulrich Bauer Date: Wed, 25 Nov 2020 22:12:35 +0100 Subject: cleanup --- ripser.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/ripser.cpp b/ripser.cpp index 301b778..bdcd249 100644 --- a/ripser.cpp +++ b/ripser.cpp @@ -706,11 +706,11 @@ template <> class ripser::simplex_coboundary_e public: simplex_coboundary_enumerator(const diameter_entry_t _simplex, const index_t _dim, - const ripser& parent) - : idx_below(get_index(_simplex)), idx_above(0), v(parent.n - 1), k(_dim + 1), - vertices(_dim + 1), simplex(_simplex), modulus(parent.modulus), dist(parent.dist), - binomial_coeff(parent.binomial_coeff) { - parent.get_simplex_vertices(get_index(_simplex), _dim, parent.n, vertices.rbegin()); + const ripser& _parent) + : idx_below(get_index(_simplex)), idx_above(0), v(_parent.n - 1), k(_dim + 1), + vertices(_dim + 1), simplex(_simplex), modulus(_parent.modulus), dist(_parent.dist), + binomial_coeff(_parent.binomial_coeff) { + _parent.get_simplex_vertices(get_index(_simplex), _dim, _parent.n, vertices.rbegin()); } bool has_next(bool all_cofacets = true) { @@ -735,7 +735,6 @@ public: }; template <> class ripser::simplex_coboundary_enumerator { - const ripser& parent; index_t idx_below, idx_above, k; std::vector vertices; const diameter_entry_t simplex; @@ -749,11 +748,11 @@ template <> class ripser::simplex_coboundary_enumerator public: simplex_coboundary_enumerator(const diameter_entry_t _simplex, const index_t _dim, const ripser& _parent) - : parent(_parent), idx_below(get_index(_simplex)), idx_above(0), k(_dim + 1), - vertices(_dim + 1), simplex(_simplex), modulus(parent.modulus), dist(parent.dist), - binomial_coeff(parent.binomial_coeff) { + : idx_below(get_index(_simplex)), idx_above(0), k(_dim + 1), vertices(_dim + 1), + simplex(_simplex), modulus(_parent.modulus), dist(_parent.dist), + binomial_coeff(_parent.binomial_coeff) { + _parent.get_simplex_vertices(idx_below, _dim, _parent.n, vertices.rbegin()); - parent.get_simplex_vertices(idx_below, _dim, parent.n, vertices.rbegin()); for (auto v : vertices) { neighbor_it.push_back(dist.neighbors[v].rbegin()); neighbor_end.push_back(dist.neighbors[v].rend()); -- cgit v1.2.3