diff options
| author | tvayer <titouan.vayer@gmail.com> | 2019-05-28 17:13:21 +0200 |
|---|---|---|
| committer | tvayer <titouan.vayer@gmail.com> | 2019-05-28 17:13:21 +0200 |
| commit | cd4b98c34f885176f33db3fab16530622f29ab42 (patch) | |
| tree | a886eb333c20c964ef24fbc3958c78af9657a54a /ot/optim.py | |
| parent | b1b514f5d9de009e63bd407dfd9c0a0cf6128876 (diff) | |
solve conlict
Diffstat (limited to 'ot/optim.py')
| -rw-r--r-- | ot/optim.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ot/optim.py b/ot/optim.py index a774865..9fce21e 100644 --- a/ot/optim.py +++ b/ot/optim.py @@ -112,7 +112,7 @@ def do_linesearch(cost,G,deltaG,Mi,f_val, The value of the cost for the next iteration References ---------- - .. [18] Vayer Titouan, Chapel Laetitia, Flamary R{\'e}mi, Tavenard Romain + .. [24] Vayer Titouan, Chapel Laetitia, Flamary R{\'e}mi, Tavenard Romain and Courty Nicolas "Optimal Transport for structured data with application on graphs" International Conference on Machine Learning (ICML). 2019. |