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 /Makefile | |
| 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 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2,7 +2,7 @@ build: ripser-representatives ripser-representatives: ripser.cpp - c++ -std=c++11 ripser.cpp -o ripser-representatives -Ofast -D NDEBUG -D USE_COEFFICIENTS -D ASSEMBLE_REDUCTION_MATRIX + c++ -std=c++11 ripser.cpp -o ripser-representatives -Ofast -D NDEBUG -D USE_COEFFICIENTS -D ASSEMBLE_REDUCTION_MATRIX -D USE_GOOGLE_HASHMAP clean: rm -f ripser-representatives |