diff options
| author | tvayer <titouan.vayer@gmail.com> | 2019-05-29 14:24:05 +0200 |
|---|---|---|
| committer | tvayer <titouan.vayer@gmail.com> | 2019-05-29 14:24:05 +0200 |
| commit | 63bbeb34e48f02c97a762dab5232158d90a5cffc (patch) | |
| tree | 853026b5854b6e4b01fdf750db139985b3dd596f /ot/lp/cvx.py | |
| parent | f70aabfcc11f92181e0dc987b341bad8ec030d75 (diff) | |
| parent | f66ab58c7c895011fd37bafd3e848828399c56c4 (diff) | |
Merge remote-tracking branch 'rflamary/master'
merge pot
Diffstat (limited to 'ot/lp/cvx.py')
| -rw-r--r-- | ot/lp/cvx.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ot/lp/cvx.py b/ot/lp/cvx.py index c8c75bc..8e763be 100644 --- a/ot/lp/cvx.py +++ b/ot/lp/cvx.py @@ -11,6 +11,7 @@ import numpy as np import scipy as sp import scipy.sparse as sps + try: import cvxopt from cvxopt import solvers, matrix, spmatrix @@ -26,7 +27,7 @@ def scipy_sparse_to_spmatrix(A): def barycenter(A, M, weights=None, verbose=False, log=False, solver='interior-point'): - """Compute the entropic regularized wasserstein barycenter of distributions A + """Compute the Wasserstein barycenter of distributions A The function solves the following optimization problem [16]: |