Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Live #6

Open
wants to merge 3 commits into
base: live
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ all: ripser ripser-coeff ripser-reduction ripser-coeff-reduction ripser-debug


ripser: ripser.cpp
c++ -std=c++11 ripser.cpp -o ripser -Ofast -D NDEBUG
c++ -std=c++11 ripser.cpp -o ripser -Ofast -D NDEBUG -D PRINT_PERSISTENCE_PAIRS -D INDICATE_PROGRESS

ripser-coeff: ripser.cpp
c++ -std=c++11 ripser.cpp -o ripser-coeff -Ofast -D NDEBUG -D USE_COEFFICIENTS
Expand All @@ -21,7 +21,8 @@ ripser-debug: ripser.cpp


clean:
rm -rf ripser ripser-coeff ripser-reduction ripser-coeff-reduction ripser-debug emscripten pnacl && NACL_SDK_ROOT=~/Source/nacl_sdk/pepper_49/ make -f Makefile_pnacl clean
yes| rm ripser ripser-coeff ripser-reduction ripser-coeff-reduction ripser-debug emscripten pnacl
#&& NACL_SDK_ROOT=~/Source/nacl_sdk/pepper_49/ make -f Makefile_pnacl clean


live: pnacl emscripten
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Input formats currently supported by Ripser:
- comma-separated values full distance matrix
- [DIPHA] distance matrix data
- point cloud data
- sparse space-separated lower triangular matrix. Each line corresponds to a row. Row n consists of pairs (k dist(n,k)), where n>k. This especially means that the first line is empty. All missing values are presumed infinite. See the examples. When using sparse matrices, the threshold is ignored -- use a python filter.

Ripser's efficiency is based on a few important concepts and principles:

Expand Down Expand Up @@ -109,4 +110,4 @@ Ripser is licensed under the [LGPL] 3.0. Please contact the author if you want t
[Perseus]: <http://www.sas.upenn.edu/~vnanda/perseus/>
[GUDHI]: <http://gudhi.gforge.inria.fr>
[sparsehash]: <https://github.com/sparsehash/sparsehash>
[LGPL]: <https://www.gnu.org/licenses/lgpl>
[LGPL]: <https://www.gnu.org/licenses/lgpl>
Loading