diff options
| author | MathieuCarriere <mathieu.carriere3@gmail.com> | 2020-04-28 10:31:12 -0400 |
|---|---|---|
| committer | MathieuCarriere <mathieu.carriere3@gmail.com> | 2020-04-28 10:31:12 -0400 |
| commit | 51ca2370ae27bec052bb4fffafc8a718ac306264 (patch) | |
| tree | 67e1ea14d4c290295b0298dba0d701303a53f3b6 /.github | |
| parent | 910f29401e053f668e4d277af098295ab05e6022 (diff) | |
| parent | 0fb22e4c499b665ad505e5d9d2c325f7561f69c4 (diff) | |
fix conflict
Diffstat (limited to '.github')
| -rw-r--r-- | .github/next_release.md | 1 | ||||
| -rw-r--r-- | .github/test-requirements.txt | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/.github/next_release.md b/.github/next_release.md index 3166b0a8..83b98a1c 100644 --- a/.github/next_release.md +++ b/.github/next_release.md @@ -9,6 +9,7 @@ Below is a list of changes made since GUDHI 3.1.1: - [Wassertein distance](https://gudhi.inria.fr/python/latest/wasserstein_distance_user.html) - An another implementation comes from Hera (BSD-3-Clause) which is based on [Geometry Helps to Compare Persistence Diagrams](http://doi.acm.org/10.1145/3064175) by Michael Kerber, Dmitriy Morozov, and Arnur Nigmetov. + - `gudhi.wasserstein.wasserstein_distance` has now an option to return the optimal matching that achieves the distance between the two diagrams. - [Module](link) - ... diff --git a/.github/test-requirements.txt b/.github/test-requirements.txt index 18882792..fb1df134 100644 --- a/.github/test-requirements.txt +++ b/.github/test-requirements.txt @@ -6,4 +6,8 @@ matplotlib scipy scikit-learn POT -tensorflow
\ No newline at end of file +tensorflow +torch +pykeops +hnswlib +eagerpy |