summaryrefslogtreecommitdiff
path: root/ot/bregman.py
diff options
context:
space:
mode:
authorMokhtar Z. Alaya <mokhtarzahdi.alaya@gmail.com>2020-01-07 15:34:22 +0100
committerGitHub <noreply@github.com>2020-01-07 15:34:22 +0100
commit7d603f0aa642dbe49da70ad3143fd4e9c74a22c5 (patch)
tree6c42198a24a5e539fea8f80a48c380aa3ec17ab7 /ot/bregman.py
parent27b6740ea95b609ecdb103fbff7c1bbc62071ddc (diff)
delete "ArrayBox"-type test of dist. matrix M
Diffstat (limited to 'ot/bregman.py')
-rw-r--r--ot/bregman.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/ot/bregman.py b/ot/bregman.py
index 456b61f..dedbf28 100644
--- a/ot/bregman.py
+++ b/ot/bregman.py
@@ -1867,12 +1867,6 @@ def screenkhorn(a, b, M, reg, ns_budget, nt_budget, uniform=True, restricted=Tru
a = np.asarray(a, dtype=np.float64)
b = np.asarray(b, dtype=np.float64)
-
- # if the "autograd" package is needed for some experiments, we then have to change the instance of the cost matrix M
- # from "ArrayBox"-type to "np.array"-type as follows:
- if isinstance(M, np.ndarray) == False:
- M = M._value
-
M = np.asarray(M, dtype=np.float64)
ns, nt = M.shape
@@ -1882,7 +1876,7 @@ def screenkhorn(a, b, M, reg, ns_budget, nt_budget, uniform=True, restricted=Tru
np.exp(K, out=K)
def projection(u, epsilon):
- u[np.where(u <= epsilon)] = epsilon
+ u[u <= epsilon] = epsilon
return u
# ----------------------------------------------------------------------------------------------------------------#