diff options
author | Rémi Flamary <remi.flamary@gmail.com> | 2020-04-24 11:20:02 +0200 |
---|---|---|
committer | Rémi Flamary <remi.flamary@gmail.com> | 2020-04-24 11:20:02 +0200 |
commit | 8599e720d5f438e2aaf5c635883e64deb026f3ce (patch) | |
tree | 840ad8693ab6f7a5fd6c150124666ac5642e77dc | |
parent | 53265dbd5530aee37a33f42e1243b26422d62acf (diff) |
correct doc for emd
-rw-r--r-- | docs/source/conf.py | 2 | ||||
-rw-r--r-- | ot/lp/__init__.py | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/docs/source/conf.py b/docs/source/conf.py index 880c71d..f3c61e7 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -67,7 +67,7 @@ extensions = [ 'sphinx.ext.ifconfig', 'sphinx.ext.viewcode', 'sphinx.ext.napoleon', - 'sphinx_gallery.gen_gallery', + #'sphinx_gallery.gen_gallery', ] napoleon_numpy_docstring = True 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 : |