summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Bauer <mail@ulrich-bauer.org>2021-02-25 22:22:48 +0100
committerUlrich Bauer <mail@ulrich-bauer.org>2021-02-25 22:24:00 +0100
commit556cf1a5bc014ad519a6b55e083f7b6d6b15af63 (patch)
treed92f8d745eb16a3ea7905c75472ea162603ce9d0
parentccbcd5b6818baf8c68d7b6b7cd36076aeb8aeb9f (diff)
prepare release
-rw-r--r--README.md20
-rw-r--r--ripser.cpp2
m---------robin-hood-hashing0
3 files changed, 11 insertions, 11 deletions
diff --git a/README.md b/README.md
index 51029bf..990aa7d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Ripser
-Copyright © 2015–2019 [Ulrich Bauer].
+Copyright © 2015–2021 [Ulrich Bauer].
### Description
@@ -39,7 +39,7 @@ Ripser's efficiency is based on a few important concepts and principles, buildin
### Version
-[Latest release][latest-release]: 1.1 (August 2019)
+[Latest release][latest-release]: 1.2 (February 2021)
### Building
@@ -61,12 +61,12 @@ Ripser supports several compile-time options. They are switched on by defining t
- `USE_COEFFICIENTS`: enable support for coefficients in a prime field
- `INDICATE_PROGRESS`: indicate the current progress in the console
- `PRINT_PERSISTENCE_PAIRS`: output the computed persistence pairs (enabled by default in the code; comment out to disable)
- - `USE_GOOGLE_HASHMAP`: enable support for Google's [sparsehash] data structure; may further reduce memory footprint
+ - `USE_ROBINHOOD_HASHMAP`: enable support for Martin Ankerl's [robinhoodhash] data structure; may further reduce memory footprint
-For example, to build Ripser with support for Google's hashmap:
+For example, to build Ripser with support for Martin Ankerl's robin hood hashmap:
```sh
-$ c++ -std=c++11 ripser.cpp -o ripser -Ofast -D NDEBUG -D USE_GOOGLE_HASHMAP
+$ c++ -std=c++11 ripser.cpp -o ripser -O3 -D NDEBUG -D USE_ROBINHOOD_HASHMAP
```
A Makefile is provided with some variants of the above options. Use `make all` to build them. The default `make` builds a binary with the default options.
@@ -79,7 +79,7 @@ The input is given either in a file whose name is passed as an argument, or thro
- `distance`: full distance matrix; similar to the above, but for all entries of the distance matrix. One line per row of the matrix; only the part below the diagonal is actually read.
- `dipha`: DIPHA distance matrix as described on the [DIPHA] website.
- `point-cloud`: point cloud; a comma (or whitespace, or other non-numerical character) separated list of coordinates of the points in some Euclidean space, one point per line.
- - `binary`: lower distance matrix in binary file format; a sequence of the distance matrix entries below the diagonal in 32 bit double format (IEEE 754, little endian).
+ - `binary`: lower distance matrix in binary file format; a sequence of the distance matrix entries below the diagonal in 32 bit float format (IEEE 754, single, little endian).
- `sparse`: sparse triplet format; a whitespace separated list of entries of a sparse distance matrix, one entry per line, each of the form *i j d(i,j)* specifying the distance between points *i* and *j*. Each pair of points should appear in the file at most once.
- `--dim k`: compute persistent homology up to dimension *k*.
- `--threshold t`: compute Rips complexes up to diameter *t*.
@@ -105,9 +105,9 @@ If you use Ripser in your research or if you want to give a reference to Ripser
@misc{1908.02518,
Author = {Ulrich Bauer},
Title = {Ripser: efficient computation of Vietoris-Rips persistence barcodes},
- Month = Aug,
- Year = {2019},
- Eprint = {1908.02518},
+ Month = Feb,
+ Year = {2021},
+ Eprint = {1908.02518v2},
Note = {Preprint}
}
```
@@ -127,5 +127,5 @@ Ripser is licensed under the [MIT] license (`COPYING.txt`), with an extra clause
[PHAT]: <http://git.io/dipha>
[Perseus]: <http://www.sas.upenn.edu/~vnanda/perseus/>
[GUDHI]: <http://gudhi.gforge.inria.fr>
-[sparsehash]: <https://github.com/sparsehash/sparsehash>
+[robinhoodhash]: <https://github.com/martinus/robin-hood-hashing>
[MIT]: <https://opensource.org/licenses/mit-license.php> \ No newline at end of file
diff --git a/ripser.cpp b/ripser.cpp
index 84da277..c1790a7 100644
--- a/ripser.cpp
+++ b/ripser.cpp
@@ -4,7 +4,7 @@
MIT License
- Copyright (c) 2015–2019 Ulrich Bauer
+ Copyright (c) 2015–2021 Ulrich Bauer
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/robin-hood-hashing b/robin-hood-hashing
-Subproject 4869243035a2732fdb96407db234bdc7a3a985c
+Subproject 7b00237399cec62ee5795f9013cf5df8de596e6