diff options
author | Ulrich Bauer <mail@ulrich-bauer.org> | 2017-03-30 08:39:07 +0200 |
---|---|---|
committer | Ulrich Bauer <mail@ulrich-bauer.org> | 2017-03-30 08:39:07 +0200 |
commit | 786f94979f88fbf495b28bd9aab50d1287d9180c (patch) | |
tree | b3314705ccb13b89ef2b02f229f4c15903f71f91 /benchmarks/benchmarks.txt | |
parent | 9d898b2a232580a36aa2d5588887e34fb777ab5a (diff) | |
parent | d898ef27044bc7f10da478d16581915e95edc2c9 (diff) |
Merge branch 'dev' into representative-cycles
* dev: (28 commits)
progress indicator
benchmark using sparsehash
updated benchmark
typo in readme
benchmark results
gudhi benchmark output
benchmark H^1
constructors fixed
code reformatting
code reformatting
reordered initializers
cleanup compressed distance matrix access
fixed move constructor
fix for missing constructor of diameter_entry_t
allow for negative edge filtration values
cleanup binomial coefficients
more code reorganization
code reorganization
moved attribute packed
don’t store diagonal in reduction matrix when not using coefficients
...
# Conflicts:
# Makefile
# ripser.cpp
# ripser.xcodeproj/project.pbxproj
Diffstat (limited to 'benchmarks/benchmarks.txt')
-rw-r--r-- | benchmarks/benchmarks.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/benchmarks/benchmarks.txt b/benchmarks/benchmarks.txt index c5fc91f..bb34d08 100644 --- a/benchmarks/benchmarks.txt +++ b/benchmarks/benchmarks.txt @@ -8,3 +8,4 @@ c++ -std=c++11 ripser.cpp -o ripser -Ofast -D NDEBUG -D FILE_FORMAT_DIPHA -D PRINT_PERSISTENCE_PAIRS && /usr/bin/time -l ./ripser --dim 2 ~/Bitbucket/phat-paper/benchmark/dipha/sphere_3_192.complex +/usr/bin/time -l java -Xmx16G -cp Bitbucket/phat-paper/benchmark:Source/javaplex/dist/javaplex-4.2.1.jar RipsFiltration ~/Bitbucket/phat-paper/benchmark/point\ cloud/sphere_3_192_points.dat 2 3
\ No newline at end of file |