summaryrefslogtreecommitdiff
path: root/ot/utils.py
diff options
context:
space:
mode:
authorRémi Flamary <remi.flamary@gmail.com>2017-06-09 13:18:04 +0200
committerRémi Flamary <remi.flamary@gmail.com>2017-06-09 13:18:04 +0200
commit2eaee96a2a927476cbd8ca31754a89afd0825916 (patch)
tree5cdb941f861400e8d3aa46df36926e8da1df9fb7 /ot/utils.py
parent37977810ab538fe461ef8f3ec16434c59f6f7c5a (diff)
add doc and correct encoding
Diffstat (limited to 'ot/utils.py')
-rw-r--r--ot/utils.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/ot/utils.py b/ot/utils.py
index e5cd6c0..fc6b0d2 100644
--- a/ot/utils.py
+++ b/ot/utils.py
@@ -63,10 +63,10 @@ def dist(x1,x2=None,metric='sqeuclidean'):
matrix with n2 samples of size d (if None then x2=x1)
metric : str, fun, optional
name of the metric to be computed (full list in the doc of scipy), If a string,
- the distance function can be ‘braycurtis’, ‘canberra’, ‘chebyshev’, ‘cityblock’,
- ‘correlation’, ‘cosine’, ‘dice’, ‘euclidean’, ‘hamming’, ‘jaccard’, ‘kulsinski’,
- ‘mahalanobis’, ‘matching’, ‘minkowski’, ‘rogerstanimoto’, ‘russellrao’, ‘seuclidean’,
- ‘sokalmichener’, ‘sokalsneath’, ‘sqeuclidean’, ‘wminkowski’, ‘yule’.
+ the distance function can be 'braycurtis', 'canberra', 'chebyshev', 'cityblock',
+ 'correlation', 'cosine', 'dice', 'euclidean', 'hamming', 'jaccard', 'kulsinski',
+ 'mahalanobis', 'matching', 'minkowski', 'rogerstanimoto', 'russellrao', 'seuclidean',
+ 'sokalmichener', 'sokalsneath', 'sqeuclidean', 'wminkowski', 'yule'.
Returns