diff options
| author | Romain Tavenard <romain.tavenard@univ-rennes2.fr> | 2019-06-27 13:29:19 +0200 |
|---|---|---|
| committer | Romain Tavenard <romain.tavenard@univ-rennes2.fr> | 2019-06-27 13:29:19 +0200 |
| commit | 362a7f8fa20cf7ae6f2e36d7e47c7ca9f81d3c51 (patch) | |
| tree | c97a7359bdf7de19d7a1cc325304852622a8f580 | |
| parent | c92e595009ad5e2ae6d4b2c040556cffb6316847 (diff) | |
Added RT as a contributor + "optimized" Cython math operations
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | ot/lp/emd_wrap.pyx | 6 |
2 files changed, 4 insertions, 3 deletions
@@ -167,6 +167,7 @@ The contributors to this library are: * [Alain Rakotomamonjy](https://sites.google.com/site/alainrakotomamonjy/home) * [Vayer Titouan](https://tvayer.github.io/) * [Hicham Janati](https://hichamjanati.github.io/) (Unbalanced OT) +* [Romain Tavenard](https://rtavenar.github.io/) (1d Wasserstein) This toolbox benefit a lot from open source research and we would like to thank the following persons for providing some code (in various languages): diff --git a/ot/lp/emd_wrap.pyx b/ot/lp/emd_wrap.pyx index 42b848f..8a4aec9 100644 --- a/ot/lp/emd_wrap.pyx +++ b/ot/lp/emd_wrap.pyx @@ -156,11 +156,11 @@ def emd_1d_sorted(np.ndarray[double, ndim=1, mode="c"] u_weights, cdef int cur_idx = 0 while i < n and j < m: if metric == 'sqeuclidean': - m_ij = (u[i] - v[j]) ** 2 + m_ij = (u[i] - v[j]) * (u[i] - v[j]) elif metric == 'cityblock' or metric == 'euclidean': - m_ij = abs(u[i] - v[j]) + m_ij = math.fabs(u[i] - v[j]) elif metric == 'minkowski': - m_ij = math.pow(abs(u[i] - v[j]), p) + m_ij = math.pow(math.fabs(u[i] - v[j]), p) else: m_ij = dist(u[i].reshape((1, 1)), v[j].reshape((1, 1)), metric=metric)[0, 0] |