diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-01-14 08:48:51 +0100 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-01-14 08:48:51 +0100 |
| commit | 88c30209fe58d29d24d5bba3c137cd5e5def29c5 (patch) | |
| tree | c7a3257ce01bd26b770bb39b508835843720fb5e /src/python/doc/wasserstein_distance_sum.inc | |
| parent | 23ccc50ab3608202452e44f287e4817ffa98227c (diff) | |
| parent | 5533e1f16c99512ff1966b31ba8f121d37462f52 (diff) | |
Merge branch 'master' into print_warnings_to_stderr
Diffstat (limited to 'src/python/doc/wasserstein_distance_sum.inc')
| -rw-r--r-- | src/python/doc/wasserstein_distance_sum.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/python/doc/wasserstein_distance_sum.inc b/src/python/doc/wasserstein_distance_sum.inc index ffd4d312..a97f428d 100644 --- a/src/python/doc/wasserstein_distance_sum.inc +++ b/src/python/doc/wasserstein_distance_sum.inc @@ -2,12 +2,12 @@ :widths: 30 50 20 +-----------------------------------------------------------------+----------------------------------------------------------------------+------------------------------------------------------------------+ - | .. figure:: | The p-Wasserstein distance measures the similarity between two | :Author: Theo Lacombe | + | .. figure:: | The q-Wasserstein distance measures the similarity between two | :Author: Theo Lacombe | | ../../doc/Bottleneck_distance/perturb_pd.png | persistence diagrams. It's the minimum value c that can be achieved | | | :figclass: align-center | by a perfect matching between the points of the two diagrams (+ all | :Introduced in: GUDHI 3.1.0 | | | diagonal points), where the value of a matching is defined as the | | - | Wasserstein distance is the p-th root of the sum of the | p-th root of the sum of all edge lengths to the power p. Edge lengths| :Copyright: MIT | - | edge lengths to the power p. | are measured in norm q, for :math:`1 \leq q \leq \infty`. | | + | Wasserstein distance is the q-th root of the sum of the | q-th root of the sum of all edge lengths to the power q. Edge lengths| :Copyright: MIT | + | edge lengths to the power q. | are measured in norm p, for :math:`1 \leq p \leq \infty`. | | | | | :Requires: Python Optimal Transport (POT) :math:`\geq` 0.5.1 | +-----------------------------------------------------------------+----------------------------------------------------------------------+------------------------------------------------------------------+ | * :doc:`wasserstein_distance_user` | | |