diff options
author | Ulrich Bauer <mail@ulrich-bauer.org> | 2017-03-30 08:55:53 +0200 |
---|---|---|
committer | Ulrich Bauer <mail@ulrich-bauer.org> | 2017-03-30 08:57:36 +0200 |
commit | e1d693231f71bdf000d6471a74b6bfa5d762d82f (patch) | |
tree | ca142259d125fe4e6502cd58c64fcb1eee1c7428 /ripser.cpp | |
parent | 786f94979f88fbf495b28bd9aab50d1287d9180c (diff) |
post-merge updates
Diffstat (limited to 'ripser.cpp')
-rw-r--r-- | ripser.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
@@ -637,7 +637,12 @@ public: std::cout << " [" << diameter << ", ): {"; auto cocycle = reduction_column; while (get_index(pivot = get_pivot(cocycle, modulus)) != -1) { - std::cout << vertices_of_simplex(get_index(pivot), dim, n, binomial_coeff) << ":" << get_coefficient(pivot); + vertices.clear(); + get_simplex_vertices(get_index(pivot), dim, n, std::back_inserter(vertices)); + std::cout << vertices; +#ifdef USE_COEFFICIENTS + std::cout << ":" << get_coefficient(pivot); +#endif cocycle.pop(); if (get_index(pivot = get_pivot(cocycle, modulus)) != -1) std::cout << ", "; } @@ -658,7 +663,12 @@ public: auto cocycle = reduction_column; diameter_entry_t e; while (get_index(e = get_pivot(cocycle, modulus)) != -1) { - std::cout << vertices_of_simplex(get_index(e), dim, n, binomial_coeff) << ":" << get_coefficient(pivot); + vertices.clear(); + get_simplex_vertices(get_index(e), dim, n, std::back_inserter(vertices)); + std::cout << vertices; +#ifdef USE_COEFFICIENTS + std::cout << ":" << get_coefficient(pivot); +#endif cocycle.pop(); if (get_index(e = get_pivot(cocycle, modulus)) != -1) std::cout << ", "; } |