summaryrefslogtreecommitdiff
path: root/docs/source/auto_examples/plot_optim_OTreg.rst
diff options
context:
space:
mode:
authorRémi Flamary <remi.flamary@gmail.com>2017-09-01 16:28:35 +0200
committerRémi Flamary <remi.flamary@gmail.com>2017-09-01 16:28:35 +0200
commit052ccadc5023ec500dc10477821bf0267426aa4f (patch)
tree7deac1febb3c8b8c20be578583c0b326856ee7db /docs/source/auto_examples/plot_optim_OTreg.rst
parent364a42954f9d2f5c43e7ff53ee0a3b6f9a682e8a (diff)
pep8
Diffstat (limited to 'docs/source/auto_examples/plot_optim_OTreg.rst')
-rw-r--r--docs/source/auto_examples/plot_optim_OTreg.rst16
1 files changed, 8 insertions, 8 deletions
diff --git a/docs/source/auto_examples/plot_optim_OTreg.rst b/docs/source/auto_examples/plot_optim_OTreg.rst
index d444631..c3ec03b 100644
--- a/docs/source/auto_examples/plot_optim_OTreg.rst
+++ b/docs/source/auto_examples/plot_optim_OTreg.rst
@@ -8,20 +8,20 @@ Regularized OT with generic solver
==================================
Illustrates the use of the generic solver for regularized OT with
-user-designed regularization term. It uses Conditional gradient as in [6] and
+user-designed regularization term. It uses Conditional gradient as in [6] and
generalized Conditional Gradient as proposed in [5][7].
-[5] N. Courty; R. Flamary; D. Tuia; A. Rakotomamonjy, Optimal Transport for
-Domain Adaptation, in IEEE Transactions on Pattern Analysis and Machine
+[5] N. Courty; R. Flamary; D. Tuia; A. Rakotomamonjy, Optimal Transport for
+Domain Adaptation, in IEEE Transactions on Pattern Analysis and Machine
Intelligence , vol.PP, no.99, pp.1-1.
-[6] Ferradans, S., Papadakis, N., Peyré, G., & Aujol, J. F. (2014).
-Regularized discrete optimal transport. SIAM Journal on Imaging Sciences,
+[6] Ferradans, S., Papadakis, N., Peyré, G., & Aujol, J. F. (2014).
+Regularized discrete optimal transport. SIAM Journal on Imaging Sciences,
7(3), 1853-1882.
-[7] Rakotomamonjy, A., Flamary, R., & Courty, N. (2015). Generalized
-conditional gradient: analysis of convergence and applications.
+[7] Rakotomamonjy, A., Flamary, R., & Courty, N. (2015). Generalized
+conditional gradient: analysis of convergence and applications.
arXiv preprint arXiv:1510.06567.
@@ -667,7 +667,7 @@ Solve EMD with Frobenius norm + entropic regularization
4|1.609284e-01|-1.111407e-12
-**Total running time of the script:** ( 0 minutes 1.867 seconds)
+**Total running time of the script:** ( 0 minutes 1.913 seconds)