summaryrefslogtreecommitdiff
path: root/ot/lp
diff options
context:
space:
mode:
authorRĂ©mi Flamary <remi.flamary@gmail.com>2020-04-28 09:50:45 +0200
committerGitHub <noreply@github.com>2020-04-28 09:50:45 +0200
commitafedeebf5bdd58ff92f52c73b9b41b8a8e66ca29 (patch)
tree60fafb54d66aa843965c000d48d249780afdcf75 /ot/lp
parentb53fb23b538e0b7f6498bc217f02adac3c8f7d07 (diff)
parent3b0732b041d46df66cb182b17f6ece040c578722 (diff)
Merge pull request #160 from PythonOT/doc_cov
[MRG] Update documentation and improve coverage
Diffstat (limited to 'ot/lp')
-rw-r--r--ot/lp/__init__.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/ot/lp/__init__.py b/ot/lp/__init__.py
index ad390c5..50003ed 100644
--- a/ot/lp/__init__.py
+++ b/ot/lp/__init__.py
@@ -180,7 +180,9 @@ def emd(a, b, M, numItermax=100000, log=False, center_dual=True):
\gamma = arg\min_\gamma <\gamma,M>_F
s.t. \gamma 1 = a
+
\gamma^T 1= b
+
\gamma\geq 0
where :
@@ -289,10 +291,12 @@ def emd2(a, b, M, processes=multiprocessing.cpu_count(),
r"""Solves the Earth Movers distance problem and returns the loss
.. math::
- \gamma = arg\min_\gamma <\gamma,M>_F
+ \min_\gamma <\gamma,M>_F
s.t. \gamma 1 = a
+
\gamma^T 1= b
+
\gamma\geq 0
where :