diff options
| author | Kilian Fatras <kilianfatras@Kilians-MacBook-Air.local> | 2019-03-29 13:59:25 +0100 |
|---|---|---|
| committer | Kilian Fatras <kilianfatras@Kilians-MacBook-Air.local> | 2019-03-29 13:59:25 +0100 |
| commit | 24b268c5d4ee3a03e5a1742168236755cfba9ed5 (patch) | |
| tree | 329f4d85c509791c10e179f580652e1a71342398 /ot | |
| parent | f63712f4df213bbfe0a2665390d51974305de705 (diff) | |
import unif and dist in bregman file
Diffstat (limited to 'ot')
| -rw-r--r-- | ot/bregman.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/ot/bregman.py b/ot/bregman.py index 9e9989f..f873a85 100644 --- a/ot/bregman.py +++ b/ot/bregman.py @@ -10,6 +10,7 @@ Bregman projections for regularized OT # License: MIT License import numpy as np +from .utils import unif, dist def sinkhorn(a, b, M, reg, method='sinkhorn', numItermax=1000, @@ -1375,11 +1376,11 @@ def empirical_sinkhorn(X_s, X_t, reg, a=None, b=None, metric='sqeuclidean', numI ''' if a is None: - a = ot.unif(np.shape(X_s)[0]) + a = unif(np.shape(X_s)[0]) if b is None: - b = ot.unif(np.shape(X_t)[0]) + b = unif(np.shape(X_t)[0]) - M = ot.dist(X_s, X_t, metric=metric) + M = dist(X_s, X_t, metric=metric) if log: pi, log = sinkhorn(a, b, M, reg, numItermax=numIterMax, stopThr=stopThr, verbose=verbose, log=True, **kwargs) @@ -1465,11 +1466,11 @@ def empirical_sinkhorn2(X_s, X_t, reg, a=None, b=None, metric='sqeuclidean', num ''' if a is None: - a = ot.unif(np.shape(X_s)[0]) + a = unif(np.shape(X_s)[0]) if b is None: - b = ot.unif(np.shape(X_t)[0]) + b = unif(np.shape(X_t)[0]) - M = ot.dist(X_s, X_t, metric=metric) + M = dist(X_s, X_t, metric=metric) if log: sinkhorn_loss, log = sinkhorn2(a, b, M, reg, numItermax=numIterMax, stopThr=stopThr, verbose=verbose, log=log, **kwargs) |