summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Bauer <mail@ulrich-bauer.org>2020-11-25 22:12:35 +0100
committerUlrich Bauer <mail@ulrich-bauer.org>2020-11-25 22:12:35 +0100
commit320b8248566a3b9108aa5ac7e751ec40d48690ee (patch)
treef421ef4b21f31a16889c2998409caa3e5ad79dd0
parent7a5b56ce3960c5981bd507fc379b8f0257d5349a (diff)
cleanup
-rw-r--r--ripser.cpp19
1 files 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<compressed_lower_distance_matrix>::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<sparse_distance_matrix>::simplex_coboundary_enumerator {
- const ripser& parent;
index_t idx_below, idx_above, k;
std::vector<index_t> vertices;
const diameter_entry_t simplex;
@@ -749,11 +748,11 @@ template <> class ripser<sparse_distance_matrix>::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());