diff options
author | RĂ©mi Flamary <remi.flamary@gmail.com> | 2020-03-13 15:33:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-13 15:33:22 +0100 |
commit | bb15cdd36aa1ea3e24d3fe36a9c49544c407fdfe (patch) | |
tree | 19359d03211d53ed5fb3fa0b1bf0a918548b30da /ot | |
parent | 18fa98fb109c935dc8d87f9c93318d8cfd118738 (diff) | |
parent | 599154c22f98eb7c0c5d3f97a6858c474b14dbdd (diff) |
Merge branch 'master' into fgw_fix
Diffstat (limited to 'ot')
-rw-r--r-- | ot/bregman.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ot/bregman.py b/ot/bregman.py index 2707b7c..d5e3563 100644 --- a/ot/bregman.py +++ b/ot/bregman.py @@ -9,6 +9,7 @@ Bregman projections for regularized OT # Titouan Vayer <titouan.vayer@irisa.fr> # Hicham Janati <hicham.janati@inria.fr> # Mokhtar Z. Alaya <mokhtarzahdi.alaya@gmail.com> +# Alexander Tong <alexander.tong@yale.edu> # # License: MIT License @@ -1346,12 +1347,17 @@ def convolutional_barycenter2d(A, reg, weights=None, numItermax=10000, err = 1 # build the convolution operator + # this is equivalent to blurring on horizontal then vertical directions t = np.linspace(0, 1, A.shape[1]) [Y, X] = np.meshgrid(t, t) xi1 = np.exp(-(X - Y)**2 / reg) + t = np.linspace(0, 1, A.shape[2]) + [Y, X] = np.meshgrid(t, t) + xi2 = np.exp(-(X - Y)**2 / reg) + def K(x): - return np.dot(np.dot(xi1, x), xi1) + return np.dot(np.dot(xi1, x), xi2) while (err > stopThr and cpt < numItermax): |