From dc8737a30cb6d9f1305173eb8d16fe6716fd1231 Mon Sep 17 00:00:00 2001 From: RĂ©mi Flamary Date: Wed, 30 Aug 2017 17:01:01 +0200 Subject: wroking make! --- docs/source/auto_examples/plot_OT_1D.rst | 46 +++++++++++++++++--------------- 1 file changed, 25 insertions(+), 21 deletions(-) (limited to 'docs/source/auto_examples/plot_OT_1D.rst') diff --git a/docs/source/auto_examples/plot_OT_1D.rst b/docs/source/auto_examples/plot_OT_1D.rst index 44b715b..a36e13c 100644 --- a/docs/source/auto_examples/plot_OT_1D.rst +++ b/docs/source/auto_examples/plot_OT_1D.rst @@ -7,7 +7,6 @@ 1D optimal transport ==================== -@author: rflamary @@ -64,55 +63,60 @@ .. code-block:: python + # Author: Remi Flamary + # + # License: MIT License + import numpy as np import matplotlib.pylab as pl import ot from ot.datasets import get_1D_gauss as gauss - #%% parameters - n=100 # nb bins + n = 100 # nb bins # bin positions - x=np.arange(n,dtype=np.float64) + x = np.arange(n, dtype=np.float64) # Gaussian distributions - a=gauss(n,m=20,s=5) # m= mean, s= std - b=gauss(n,m=60,s=10) + a = gauss(n, m=20, s=5) # m= mean, s= std + b = gauss(n, m=60, s=10) # loss matrix - M=ot.dist(x.reshape((n,1)),x.reshape((n,1))) - M/=M.max() + M = ot.dist(x.reshape((n, 1)), x.reshape((n, 1))) + M /= M.max() #%% plot the distributions - pl.figure(1) - pl.plot(x,a,'b',label='Source distribution') - pl.plot(x,b,'r',label='Target distribution') + pl.figure(1, figsize=(6.4, 3)) + pl.plot(x, a, 'b', label='Source distribution') + pl.plot(x, b, 'r', label='Target distribution') pl.legend() #%% plot distributions and loss matrix - pl.figure(2) - ot.plot.plot1D_mat(a,b,M,'Cost matrix M') + pl.figure(2, figsize=(5, 5)) + ot.plot.plot1D_mat(a, b, M, 'Cost matrix M') #%% EMD - G0=ot.emd(a,b,M) + G0 = ot.emd(a, b, M) - pl.figure(3) - ot.plot.plot1D_mat(a,b,G0,'OT matrix G0') + pl.figure(3, figsize=(5, 5)) + ot.plot.plot1D_mat(a, b, G0, 'OT matrix G0') #%% Sinkhorn - lambd=1e-3 - Gs=ot.sinkhorn(a,b,M,lambd,verbose=True) + lambd = 1e-3 + Gs = ot.sinkhorn(a, b, M, lambd, verbose=True) + + pl.figure(4, figsize=(5, 5)) + ot.plot.plot1D_mat(a, b, Gs, 'OT matrix Sinkhorn') - pl.figure(4) - ot.plot.plot1D_mat(a,b,Gs,'OT matrix Sinkhorn') + pl.show() -**Total running time of the script:** ( 0 minutes 0.674 seconds) +**Total running time of the script:** ( 0 minutes 1.050 seconds) -- cgit v1.2.3