diff options
| author | Rémi Flamary <remi.flamary@gmail.com> | 2018-05-29 16:16:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-29 16:16:41 +0200 |
| commit | 90efa5a8b189214d1aeb81920b2bb04ce0c261ca (patch) | |
| tree | 62e2f1a3cca2f4885e8c0e2a0b135a5f574d6a8c /ot/bregman.py | |
| parent | ec79b791f4f4a62f7c04b7bbf14fe2f5dcbb4c75 (diff) | |
| parent | 54f0b47e55c966d5492e4ce19ec4e704ef3278d6 (diff) | |
Merge pull request #47 from rflamary/bary
LP Wasserstein barycenter with scipy linear solver and/or cvxopt
Diffstat (limited to 'ot/bregman.py')
| -rw-r--r-- | ot/bregman.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ot/bregman.py b/ot/bregman.py index 07b8660..b017c1a 100644 --- a/ot/bregman.py +++ b/ot/bregman.py @@ -839,11 +839,13 @@ def barycenter(A, M, reg, weights=None, numItermax=1000, Parameters ---------- A : np.ndarray (d,n) - n training distributions of size d + n training distributions a_i of size d M : np.ndarray (d,d) loss matrix for OT reg : float Regularization term >0 + weights : np.ndarray (n,) + Weights of each histogram a_i on the simplex (barycentric coodinates) numItermax : int, optional Max number of iterations stopThr : float, optional |