diff options
| author | Antoine Rolet <antoine.rolet@gmail.com> | 2017-09-05 17:15:45 +0900 |
|---|---|---|
| committer | Antoine Rolet <antoine.rolet@gmail.com> | 2017-09-05 17:15:45 +0900 |
| commit | d52b4ea415d9bb669be04ccd0940f9b3d258d0e1 (patch) | |
| tree | e91696a58f9ad30c82cbdf6c5d0f0b0bb58813c2 /ot/lp/__init__.py | |
| parent | d43ce6fdca486fdb0fe049ab3cae4daf8652f5d0 (diff) | |
Fixed typo and merged emd tests
Diffstat (limited to 'ot/lp/__init__.py')
| -rw-r--r-- | ot/lp/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ot/lp/__init__.py b/ot/lp/__init__.py index a14d4e4..6048f60 100644 --- a/ot/lp/__init__.py +++ b/ot/lp/__init__.py @@ -168,6 +168,6 @@ def emd2(a, b, M, processes=multiprocessing.cpu_count(), numItermax=100000): # res = [emd2_c(a, b[:, i].copy(), M, numItermax) for i in range(nb)] def f(b): - return emd2_c(a,b,M, max_iter)[0] + return emd2_c(a,b,M, numItermax)[0] res= parmap(f, [b[:,i] for i in range(nb)],processes) return np.array(res) |