diff options
author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-11-18 08:03:56 +0100 |
---|---|---|
committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-11-18 08:03:56 +0100 |
commit | 8b7a25482dfd9c38825e022d5f95135f0aade738 (patch) | |
tree | e986157f9921aa261a58c8d812f2802cab248310 /src/python/doc/bottleneck_distance_user.rst | |
parent | d33eaa80b7c337fde11bb5db60df79fbc81fb483 (diff) | |
parent | ad5d38986542715e0a0518537afaadcda71d9c49 (diff) |
merge master and resolve conflicts
Diffstat (limited to 'src/python/doc/bottleneck_distance_user.rst')
-rw-r--r-- | src/python/doc/bottleneck_distance_user.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/python/doc/bottleneck_distance_user.rst b/src/python/doc/bottleneck_distance_user.rst index 6c6e08d9..7baa76cc 100644 --- a/src/python/doc/bottleneck_distance_user.rst +++ b/src/python/doc/bottleneck_distance_user.rst @@ -47,7 +47,7 @@ The following example explains how the distance is computed: :figclass: align-center The point (0, 13) is at distance 6.5 from the diagonal and more - specifically from the point (6.5, 6.5) + specifically from the point (6.5, 6.5). Basic example @@ -72,6 +72,6 @@ The output is: .. testoutput:: - Bottleneck distance approximation = 0.81 + Bottleneck distance approximation = 0.72 Bottleneck distance value = 0.75 |