diff options
author | Ulrich Bauer <mail@ulrich-bauer.org> | 2019-08-28 13:49:16 +0200 |
---|---|---|
committer | Ulrich Bauer <mail@ulrich-bauer.org> | 2019-08-28 13:49:16 +0200 |
commit | a1165cdf99a89a6122cdeab7dc064e6a206f10d6 (patch) | |
tree | e3fa89d7dcc062fc29063fe7cae93b138accb654 /benchmarks/output/dragon-2.ripser.txt | |
parent | 579ae7ae34875d1c6fb586836eb8f25d24b9f1f5 (diff) | |
parent | 94eb1f7db4421e324a827590f60aa236af56666c (diff) |
Merge commit '94eb1f7db4421e324a827590f60aa236af56666c' into dev
* commit '94eb1f7db4421e324a827590f60aa236af56666c':
coboundary enumerator cleanup
code cleanup pop_pivot
fixed size_t / index_t conversion warnings
updated and cleaned up readme
renamed variables, changing "face" to "facet"
benchmark moved to repository "ripser-benchmark"
updated readme, reflecting the transition to WebAssembly for Ripser Live
# Conflicts:
# benchmarks/Dockerfile
# benchmarks/output/clifford_torus_50000.ripser.txt
# benchmarks/output/dragon-2.ripser-no-emergent.txt
# benchmarks/output/dragon-2.ripser.txt
# benchmarks/output/fractal-r.ripser.txt
# benchmarks/output/o3_1024.dipha-multicore.txt
# benchmarks/output/o3_1024.dipha.txt
# benchmarks/output/o3_1024.gudhi.txt
# benchmarks/output/o3_1024.ripser-no-emergent.txt
# benchmarks/output/o3_1024.ripser-store-reduced.txt
# benchmarks/output/o3_1024.ripser-use-reduced.txt
# benchmarks/output/o3_1024.ripser.txt
# benchmarks/output/o3_4096.gudhi.txt
# benchmarks/output/o3_4096.ripser-no-emergent.txt
# benchmarks/output/o3_4096.ripser.txt
# benchmarks/output/random.ripser-no-emergent.txt
# benchmarks/output/random.ripser-store-reduced.txt
# benchmarks/output/random.ripser-use-reduced.txt
# benchmarks/output/random.ripser.txt
# benchmarks/output/sphere_3_192.ripser-no-emergent.txt
# benchmarks/output/sphere_3_192.ripser-store-reduced.txt
# benchmarks/output/sphere_3_192.ripser-use-reduced.txt
# benchmarks/output/sphere_3_192.ripser.txt
Diffstat (limited to 'benchmarks/output/dragon-2.ripser.txt')
0 files changed, 0 insertions, 0 deletions