summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Bauer <mail@ulrich-bauer.org>2020-11-25 22:04:10 +0100
committerUlrich Bauer <mail@ulrich-bauer.org>2020-11-25 22:04:10 +0100
commit7a5b56ce3960c5981bd507fc379b8f0257d5349a (patch)
tree4a270df4fd53a76ebf459719f7005cc5d8e19377
parent286d3696796a707eecd0f71e6377880f60c936da (diff)
cleanup
-rw-r--r--ripser.cpp17
1 files 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<std::vector<index_diameter_t>::const_reverse_iterator> neighbor_it;
- mutable std::vector<std::vector<index_diameter_t>::const_reverse_iterator> neighbor_end;
-
sparse_distance_matrix(std::vector<std::vector<index_diameter_t>>&& _neighbors,
index_t _num_edges)
: neighbors(std::move(_neighbors)), num_edges(_num_edges) {}
@@ -581,8 +578,9 @@ public:
template <typename Column>
void add_coboundary(compressed_sparse_matrix<diameter_entry_t>& reduction_matrix,
const std::vector<diameter_index_t>& 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<sparse_distance_matrix>::simplex_coboundary_enumerator
const coefficient_t modulus;
const sparse_distance_matrix& dist;
const binomial_coeff_table& binomial_coeff;
- std::vector<std::vector<index_diameter_t>::const_reverse_iterator>& neighbor_it;
- std::vector<std::vector<index_diameter_t>::const_reverse_iterator>& neighbor_end;
+ std::vector<std::vector<index_diameter_t>::const_reverse_iterator> neighbor_it;
+ std::vector<std::vector<index_diameter_t>::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) {