summaryrefslogtreecommitdiff
path: root/ot/lp
diff options
context:
space:
mode:
authorKilian <kilian.fatras@gmail.com>2018-06-26 11:10:40 -0700
committerGitHub <noreply@github.com>2018-06-26 11:10:40 -0700
commitb4bc86176a5712fdd2f930fbf5d1968edd5efa5e (patch)
tree075c694496216f0a6db61e879ece5eb2e799fc07 /ot/lp
parent208ff4627ba28aa3f35328c5928324019c23ddac (diff)
parent327b0c6e0ccb0c9453179eb316021c34bcdffec4 (diff)
Merge branch 'master' into stochastic_OT
Diffstat (limited to 'ot/lp')
-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