diff options
author | Rémi Flamary <remi.flamary@gmail.com> | 2017-09-01 15:31:44 +0200 |
---|---|---|
committer | Rémi Flamary <remi.flamary@gmail.com> | 2017-09-01 15:31:44 +0200 |
commit | 062071b20d1d40c64bb619931bd11bd28e780485 (patch) | |
tree | 74bfcd48bb65304c2a5be74c24cdff29bd82ba4b /docs/source/auto_examples/plot_optim_OTreg.rst | |
parent | 212f3889b1114026765cda0134e02766daa82af2 (diff) |
update example with rst titles
Diffstat (limited to 'docs/source/auto_examples/plot_optim_OTreg.rst')
-rw-r--r-- | docs/source/auto_examples/plot_optim_OTreg.rst | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/docs/source/auto_examples/plot_optim_OTreg.rst b/docs/source/auto_examples/plot_optim_OTreg.rst index 532d4ca..d444631 100644 --- a/docs/source/auto_examples/plot_optim_OTreg.rst +++ b/docs/source/auto_examples/plot_optim_OTreg.rst @@ -7,6 +7,24 @@ 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 +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 +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, +7(3), 1853-1882. + +[7] Rakotomamonjy, A., Flamary, R., & Courty, N. (2015). Generalized +conditional gradient: analysis of convergence and applications. +arXiv preprint arXiv:1510.06567. + + @@ -25,7 +43,7 @@ Regularized OT with generic solver -Generate data +Generate data ############################################################################# @@ -54,7 +72,7 @@ Generate data -Solve EMD +Solve EMD ############################################################################# @@ -612,6 +630,7 @@ Solve EMD with Frobenius norm + entropic regularization #%% Example with Frobenius norm + entropic regularization with gcg + def f(G): return 0.5 * np.sum(G**2) @@ -645,10 +664,10 @@ Solve EMD with Frobenius norm + entropic regularization 1|1.610121e-01|-5.152589e-02 2|1.609378e-01|-4.622297e-04 3|1.609284e-01|-5.830043e-05 - 4|1.609284e-01|-1.111580e-12 + 4|1.609284e-01|-1.111407e-12 -**Total running time of the script:** ( 0 minutes 2.719 seconds) +**Total running time of the script:** ( 0 minutes 1.867 seconds) @@ -667,4 +686,4 @@ Solve EMD with Frobenius norm + entropic regularization .. rst-class:: sphx-glr-signature - `Generated by Sphinx-Gallery <http://sphinx-gallery.readthedocs.io>`_ + `Generated by Sphinx-Gallery <https://sphinx-gallery.readthedocs.io>`_ |