diff options
| author | Rémi Flamary <remi.flamary@gmail.com> | 2018-06-11 12:01:27 +0200 |
|---|---|---|
| committer | Rémi Flamary <remi.flamary@gmail.com> | 2018-06-11 12:01:27 +0200 |
| commit | ef17fcd2d5e85b986ff21d8039483bdaf03e37da (patch) | |
| tree | 25cf5915a26273b3e0726494ed4a1405ce1e2786 /docs/source/auto_examples/plot_optim_OTreg.rst | |
| parent | 8046b8c424d7b80f520e212e2bf8de41cb624aab (diff) | |
| parent | 530dc93a60e9b81fb8d1b44680deea77dacf660b (diff) | |
Merge branch 'master' into smooth_ot
Diffstat (limited to 'docs/source/auto_examples/plot_optim_OTreg.rst')
| -rw-r--r-- | docs/source/auto_examples/plot_optim_OTreg.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/source/auto_examples/plot_optim_OTreg.rst b/docs/source/auto_examples/plot_optim_OTreg.rst index 5927428..844cba0 100644 --- a/docs/source/auto_examples/plot_optim_OTreg.rst +++ b/docs/source/auto_examples/plot_optim_OTreg.rst @@ -59,8 +59,8 @@ Generate data x = np.arange(n, dtype=np.float64) # Gaussian distributions - a = ot.datasets.get_1D_gauss(n, m=20, s=5) # m= mean, s= std - b = ot.datasets.get_1D_gauss(n, m=60, s=10) + a = ot.datasets.make_1D_gauss(n, m=20, s=5) # m= mean, s= std + b = ot.datasets.make_1D_gauss(n, m=60, s=10) # loss matrix M = ot.dist(x.reshape((n, 1)), x.reshape((n, 1))) @@ -636,7 +636,7 @@ Solve EMD with Frobenius norm + entropic regularization 4|1.609284e-01|-1.111407e-12 -**Total running time of the script:** ( 0 minutes 2.589 seconds) +**Total running time of the script:** ( 0 minutes 1.990 seconds) |