summaryrefslogtreecommitdiff
path: root/ot/lp/__init__.py
diff options
context:
space:
mode:
authorRĂ©mi Flamary <remi.flamary@gmail.com>2018-06-11 13:13:33 +0200
committerGitHub <noreply@github.com>2018-06-11 13:13:33 +0200
commit327b0c6e0ccb0c9453179eb316021c34bcdffec4 (patch)
tree7d6f87bbbe776b7194a8fd1469094d1ce9506f97 /ot/lp/__init__.py
parent530dc93a60e9b81fb8d1b44680deea77dacf660b (diff)
parentecb093b95ddbeaeb800b443d3a5c9d5c24c5897c (diff)
Merge pull request #50 from rflamary/smooth_ot
Smooth and Sparse OT
Diffstat (limited to 'ot/lp/__init__.py')
-rw-r--r--ot/lp/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/ot/lp/__init__.py b/ot/lp/__init__.py
index 5dda82a..4c0d170 100644
--- a/ot/lp/__init__.py
+++ b/ot/lp/__init__.py
@@ -18,6 +18,8 @@ from .emd_wrap import emd_c, check_result
from ..utils import parmap
from .cvx import barycenter
+__all__=['emd', 'emd2', 'barycenter', 'cvx']
+
def emd(a, b, M, numItermax=100000, log=False):
"""Solves the Earth Movers distance problem and returns the OT matrix