From ee19d423adc85a960c9a46e4f81c370196805dbf Mon Sep 17 00:00:00 2001 From: Rémi Flamary Date: Fri, 16 Feb 2018 15:04:04 +0100 Subject: update notebooks --- docs/source/auto_examples/plot_OT_1D.ipynb | 170 ++++++++++++++--------------- 1 file changed, 85 insertions(+), 85 deletions(-) (limited to 'docs/source/auto_examples/plot_OT_1D.ipynb') diff --git a/docs/source/auto_examples/plot_OT_1D.ipynb b/docs/source/auto_examples/plot_OT_1D.ipynb index 26748c2..649efa6 100644 --- a/docs/source/auto_examples/plot_OT_1D.ipynb +++ b/docs/source/auto_examples/plot_OT_1D.ipynb @@ -1,126 +1,126 @@ { - "nbformat_minor": 0, - "nbformat": 4, "cells": [ { - "execution_count": null, - "cell_type": "code", - "source": [ - "%matplotlib inline" - ], - "outputs": [], + "execution_count": null, "metadata": { "collapsed": false - } - }, + }, + "outputs": [], + "source": [ + "%matplotlib inline" + ], + "cell_type": "code" + }, { + "metadata": {}, "source": [ "\n# 1D optimal transport\n\n\nThis example illustrates the computation of EMD and Sinkhorn transport plans\nand their visualization.\n\n\n" - ], - "cell_type": "markdown", - "metadata": {} - }, + ], + "cell_type": "markdown" + }, { - "execution_count": null, - "cell_type": "code", - "source": [ - "# Author: Remi Flamary \n#\n# License: MIT License\n\nimport numpy as np\nimport matplotlib.pylab as pl\nimport ot\nfrom ot.datasets import get_1D_gauss as gauss" - ], - "outputs": [], + "execution_count": null, "metadata": { "collapsed": false - } - }, + }, + "outputs": [], + "source": [ + "# Author: Remi Flamary \n#\n# License: MIT License\n\nimport numpy as np\nimport matplotlib.pylab as pl\nimport ot\nimport ot.plot\nfrom ot.datasets import get_1D_gauss as gauss" + ], + "cell_type": "code" + }, { + "metadata": {}, "source": [ "Generate data\n-------------\n\n" - ], - "cell_type": "markdown", - "metadata": {} - }, + ], + "cell_type": "markdown" + }, { - "execution_count": null, - "cell_type": "code", - "source": [ - "#%% parameters\n\nn = 100 # nb bins\n\n# bin positions\nx = np.arange(n, dtype=np.float64)\n\n# Gaussian distributions\na = gauss(n, m=20, s=5) # m= mean, s= std\nb = gauss(n, m=60, s=10)\n\n# loss matrix\nM = ot.dist(x.reshape((n, 1)), x.reshape((n, 1)))\nM /= M.max()" - ], - "outputs": [], + "execution_count": null, "metadata": { "collapsed": false - } - }, + }, + "outputs": [], + "source": [ + "#%% parameters\n\nn = 100 # nb bins\n\n# bin positions\nx = np.arange(n, dtype=np.float64)\n\n# Gaussian distributions\na = gauss(n, m=20, s=5) # m= mean, s= std\nb = gauss(n, m=60, s=10)\n\n# loss matrix\nM = ot.dist(x.reshape((n, 1)), x.reshape((n, 1)))\nM /= M.max()" + ], + "cell_type": "code" + }, { + "metadata": {}, "source": [ "Plot distributions and loss matrix\n----------------------------------\n\n" - ], - "cell_type": "markdown", - "metadata": {} - }, + ], + "cell_type": "markdown" + }, { - "execution_count": null, - "cell_type": "code", - "source": [ - "#%% plot the distributions\n\npl.figure(1, figsize=(6.4, 3))\npl.plot(x, a, 'b', label='Source distribution')\npl.plot(x, b, 'r', label='Target distribution')\npl.legend()\n\n#%% plot distributions and loss matrix\n\npl.figure(2, figsize=(5, 5))\not.plot.plot1D_mat(a, b, M, 'Cost matrix M')" - ], - "outputs": [], + "execution_count": null, "metadata": { "collapsed": false - } - }, + }, + "outputs": [], + "source": [ + "#%% plot the distributions\n\npl.figure(1, figsize=(6.4, 3))\npl.plot(x, a, 'b', label='Source distribution')\npl.plot(x, b, 'r', label='Target distribution')\npl.legend()\n\n#%% plot distributions and loss matrix\n\npl.figure(2, figsize=(5, 5))\not.plot.plot1D_mat(a, b, M, 'Cost matrix M')" + ], + "cell_type": "code" + }, { + "metadata": {}, "source": [ "Solve EMD\n---------\n\n" - ], - "cell_type": "markdown", - "metadata": {} - }, + ], + "cell_type": "markdown" + }, { - "execution_count": null, - "cell_type": "code", - "source": [ - "#%% EMD\n\nG0 = ot.emd(a, b, M)\n\npl.figure(3, figsize=(5, 5))\not.plot.plot1D_mat(a, b, G0, 'OT matrix G0')" - ], - "outputs": [], + "execution_count": null, "metadata": { "collapsed": false - } - }, + }, + "outputs": [], + "source": [ + "#%% EMD\n\nG0 = ot.emd(a, b, M)\n\npl.figure(3, figsize=(5, 5))\not.plot.plot1D_mat(a, b, G0, 'OT matrix G0')" + ], + "cell_type": "code" + }, { + "metadata": {}, "source": [ "Solve Sinkhorn\n--------------\n\n" - ], - "cell_type": "markdown", - "metadata": {} - }, + ], + "cell_type": "markdown" + }, { - "execution_count": null, - "cell_type": "code", - "source": [ - "#%% Sinkhorn\n\nlambd = 1e-3\nGs = ot.sinkhorn(a, b, M, lambd, verbose=True)\n\npl.figure(4, figsize=(5, 5))\not.plot.plot1D_mat(a, b, Gs, 'OT matrix Sinkhorn')\n\npl.show()" - ], - "outputs": [], + "execution_count": null, "metadata": { "collapsed": false - } + }, + "outputs": [], + "source": [ + "#%% Sinkhorn\n\nlambd = 1e-3\nGs = ot.sinkhorn(a, b, M, lambd, verbose=True)\n\npl.figure(4, figsize=(5, 5))\not.plot.plot1D_mat(a, b, Gs, 'OT matrix Sinkhorn')\n\npl.show()" + ], + "cell_type": "code" } - ], + ], "metadata": { - "kernelspec": { - "display_name": "Python 2", - "name": "python2", - "language": "python" - }, "language_info": { - "mimetype": "text/x-python", - "nbconvert_exporter": "python", - "name": "python", - "file_extension": ".py", - "version": "2.7.12", - "pygments_lexer": "ipython2", + "name": "python", "codemirror_mode": { - "version": 2, - "name": "ipython" - } + "name": "ipython", + "version": 3 + }, + "nbconvert_exporter": "python", + "version": "3.5.2", + "pygments_lexer": "ipython3", + "file_extension": ".py", + "mimetype": "text/x-python" + }, + "kernelspec": { + "display_name": "Python 3", + "name": "python3", + "language": "python" } - } + }, + "nbformat_minor": 0, + "nbformat": 4 } \ No newline at end of file -- cgit v1.2.3