From c90ab47ff9a159cba1f1a1d5a99cfbd88c7bcf3d Mon Sep 17 00:00:00 2001 From: josephsalmon Date: Mon, 15 Feb 2021 15:06:51 +0100 Subject: [PATCH] simplifying: no more amsmath --- apt.txt | 7 --- notebooks/Densite_Gaussian2D.ipynb | 89 ++++++++++++++++++++---------- notebooks/test_tex.ipynb | 14 +++-- postBuild | 9 --- requirements.txt | 2 - 5 files changed, 69 insertions(+), 52 deletions(-) delete mode 100644 apt.txt delete mode 100644 postBuild diff --git a/apt.txt b/apt.txt deleted file mode 100644 index 64aabeb..0000000 --- a/apt.txt +++ /dev/null @@ -1,7 +0,0 @@ -texlive-latex-base -texlive-latex-recommended -texlive-science -texlive-latex-extra -texlive-fonts-recommended -dvipng -ghostscript diff --git a/notebooks/Densite_Gaussian2D.ipynb b/notebooks/Densite_Gaussian2D.ipynb index ff4bc20..72154a3 100644 --- a/notebooks/Densite_Gaussian2D.ipynb +++ b/notebooks/Densite_Gaussian2D.ipynb @@ -24,9 +24,9 @@ "from scipy.stats import norm, multivariate_normal\n", "import ipywidgets # ipywidgets>=7.5\n", "\n", - "from matplotlib import rcParams\n", - "rcParams['text.usetex'] = True\n", - "rcParams['text.latex.preamble'] = r'\\usepackage{{amsmath}}'" + "# from matplotlib import rcParams\n", + "# rcParams['text.usetex'] = True\n", + "# rcParams['text.latex.preamble'] = r'\\usepackage{{amsmath}}'" ] }, { @@ -104,7 +104,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 30, "metadata": { "solution": "hidden", "solution_first": true @@ -141,7 +141,7 @@ "\n", " with output:\n", " self.fig, self.ax = plt.subplots(1, 2, sharex=True,\n", - " num='Gaussiennes: Densité et tirages aléatoires 2D',\n", + "# num='Gaussiennes: Densité et tirages aléatoires 2D',\n", " constrained_layout=True, figsize=(6.8, 4.4))\n", " self.fig.canvas.toolbar_visible = False\n", " \n", @@ -165,12 +165,23 @@ " self.ax[1].set_yticks(np.arange(self.xranges[0],self.xranges[1] + 1, 5))\n", " self.ax[1].set_xticks(np.arange(self.yranges[0],self.yranges[1] + 1, 5))\n", " \n", - " tex = r\"$\\Sigma = \\begin{{pmatrix}} {sig11:.2f} & {sig12:.2f} \\\\ {sig21:.2f} & {sig22:.2f} \\end{{pmatrix}}$\".format(sig11=self.Sigma[0, 0],\n", - " sig12=self.Sigma[1, 0],\n", - " sig21=self.Sigma[0, 1],\n", - " sig22=self.Sigma[1, 1]) \n", - " self.my_text = self.ax[1].text(-5, 12, tex,\n", - " size=14,color='black')\n", + "# tex = r\"$\\Sigma = \\begin{{pmatrix}} {sig11:.2f} & {sig12:.2f} \\\\ {sig21:.2f} & {sig22:.2f} \\end{{pmatrix}}$\".format(sig11=self.Sigma[0, 0],\n", + "# sig12=self.Sigma[1, 0],\n", + "# sig21=self.Sigma[0, 1],\n", + "# sig22=self.Sigma[1, 1]) \n", + "# self.my_text = self.ax[1].text(-5, 12, tex,\n", + "# size=14,color='black')\n", + "# self.ax[1].text(-5, 12, '{sig11:.2f} , {sig12:.2f}',\n", + "# size=14,color='black')\n", + "\n", + " self.my_text_up = self.ax[1].text(-0.9, 13, '{sig11:6.2f} {sig12:6.2f}'.format(sig11=self.Sigma[0, 0], sig12=self.Sigma[1, 0]),\n", + " size=8,color='black')\n", + " self.my_text_down = self.ax[1].text(-0.9, 11.6, '{sig21:6.2f} {sig22:6.2f}'.format( sig21=self.Sigma[0, 1], sig22=self.Sigma[1, 1]),\n", + " size=8,color='black')\n", + "\n", + " self.ax[1].text(-5, 12, '$\\Sigma = $', size=14,color='black')\n", + " self.ax[1].text(-2, 11.5, '$[$', size=40,color='black')\n", + " self.ax[1].text(4.0, 11.5, '$]$', size=40,color='black')\n", "\n", "# self.fig.canvas.toolbar_position = 'bottom'\n", " self.cdf = self.ax[1].contourf(self.xx, self.yy, Z, levels=12, cmap='Oranges')\n", @@ -226,11 +237,14 @@ " self.theta_radian = self.theta / 180.0 * np.pi # convertion en radian\n", " self.Sigma = angle_scalar_to_covmat(self.theta_radian, self.sig1, self.sig2)\n", " self.samples = np.random.multivariate_normal([0, 0], self.Sigma, self.n_samples)\n", - " tex = r\"$\\Sigma = \\begin{{pmatrix}} {sig11:.2f} & {sig12:.2f} \\\\ {sig21:.2f} & {sig22:.2f} \\end{{pmatrix}}$\".format(sig11=self.Sigma[0, 0],\n", - " sig12=self.Sigma[1, 0],\n", - " sig21=self.Sigma[0, 1],\n", - " sig22=self.Sigma[1, 1]) \n", - " self.my_text.set_text(tex)\n", + "# tex = r\"$\\Sigma = \\begin{{pmatrix}} {sig11:.2f} & {sig12:.2f} \\\\ {sig21:.2f} & {sig22:.2f} \\end{{pmatrix}}$\".format(sig11=self.Sigma[0, 0],\n", + "# sig12=self.Sigma[1, 0],\n", + "# sig21=self.Sigma[0, 1],\n", + "# sig22=self.Sigma[1, 1]) \n", + "\n", + " self.my_text_up.set_text('{sig11:6.2f} {sig12:6.2f}'.format(sig11=self.Sigma[0, 0], sig12=self.Sigma[1, 0]))\n", + " self.my_text_down.set_text('{sig21:6.2f} {sig22:6.2f}'.format( sig21=self.Sigma[0, 1], sig22=self.Sigma[1, 1]))\n", + " \n", "\n", " Z = pdf_2d(self.Xg, self.Yg, theta=self.theta_radian, sig1=self.sig1, sig2=self.sig2)\n", " self.pdf.remove()\n", @@ -251,12 +265,15 @@ " self.sig1 = change.new\n", " self.Sigma = angle_scalar_to_covmat(self.theta_radian, self.sig1, self.sig2)\n", " self.samples = np.random.multivariate_normal([0, 0], self.Sigma, self.n_samples)\n", - " tex = r\"$\\Sigma = \\begin{{pmatrix}} {sig11:.2f} & {sig12:.2f} \\\\ {sig21:.2f} & {sig22:.2f} \\end{{pmatrix}}$\".format(sig11=self.Sigma[0, 0],\n", - " sig12=self.Sigma[1, 0],\n", - " sig21=self.Sigma[0, 1],\n", - " sig22=self.Sigma[1, 1]) \n", - " self.my_text.set_text(tex)\n", + "# tex = r\"$\\Sigma = \\begin{{pmatrix}} {sig11:.2f} & {sig12:.2f} \\\\ {sig21:.2f} & {sig22:.2f} \\end{{pmatrix}}$\".format(sig11=self.Sigma[0, 0],\n", + "# sig12=self.Sigma[1, 0],\n", + "# sig21=self.Sigma[0, 1],\n", + "# sig22=self.Sigma[1, 1]) \n", + "# self.my_text.set_text(tex)\n", " \n", + " self.my_text_up.set_text('{sig11:6.3f} {sig12:6.3f}'.format(sig11=self.Sigma[0, 0], sig12=self.Sigma[1, 0]))\n", + " self.my_text_down.set_text('{sig21:6.3f} {sig22:6.3f}'.format( sig21=self.Sigma[0, 1], sig22=self.Sigma[1, 1]))\n", + "\n", " Z = pdf_2d(self.Xg, self.Yg, theta=self.theta_radian, sig1=self.sig1, sig2=self.sig2)\n", " self.pdf.remove()\n", " self.pdf = self.ax[0].plot_surface(self.Xg, self.Yg, Z, cmap='Oranges', rstride=3, cstride=3,\n", @@ -277,12 +294,14 @@ " self.sig2 = change.new\n", " self.Sigma = angle_scalar_to_covmat(self.theta_radian, self.sig1, self.sig2)\n", " self.samples = np.random.multivariate_normal([0, 0], self.Sigma, self.n_samples)\n", + " self.my_text_up.set_text('{sig11:6.2f} {sig12:6.2f}'.format(sig11=self.Sigma[0, 0], sig12=self.Sigma[1, 0]))\n", + " self.my_text_down.set_text('{sig21:6.2f} {sig22:6.2f}'.format( sig21=self.Sigma[0, 1], sig22=self.Sigma[1, 1]))\n", "\n", - " tex = r\"$\\Sigma = \\begin{{pmatrix}} {sig11:.2f} & {sig12:.2f} \\\\ {sig21:.2f} & {sig22:.2f} \\end{{pmatrix}}$\".format(sig11=self.Sigma[0, 0],\n", - " sig12=self.Sigma[1, 0],\n", - " sig21=self.Sigma[0, 1],\n", - " sig22=self.Sigma[1, 1]) \n", - " self.my_text.set_text(tex) \n", + "# tex = r\"$\\Sigma = \\begin{{pmatrix}} {sig11:.2f} & {sig12:.2f} \\\\ {sig21:.2f} & {sig22:.2f} \\end{{pmatrix}}$\".format(sig11=self.Sigma[0, 0],\n", + "# sig12=self.Sigma[1, 0],\n", + "# sig21=self.Sigma[0, 1],\n", + "# sig22=self.Sigma[1, 1]) \n", + "# self.my_text.set_text(tex) \n", " \n", " Z = pdf_2d(self.Xg, self.Yg, theta=self.theta_radian, sig1=self.sig1, sig2=self.sig2)\n", " self.pdf.remove()\n", @@ -349,13 +368,13 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 31, "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "f0e58149e0984af0ae5b0a9181bb9559", + "model_id": "f37709b165a74bb892ea005aabc048a1", "version_major": 2, "version_minor": 0 }, @@ -379,6 +398,20 @@ }, "outputs": [], "source": [] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [] } ], "metadata": { diff --git a/notebooks/test_tex.ipynb b/notebooks/test_tex.ipynb index 824a538..e4aeeed 100644 --- a/notebooks/test_tex.ipynb +++ b/notebooks/test_tex.ipynb @@ -2,7 +2,7 @@ "cells": [ { "cell_type": "code", - "execution_count": 4, + "execution_count": 1, "metadata": {}, "outputs": [ { @@ -17,8 +17,8 @@ "import matplotlib.pyplot as plt\n", "import numpy as np\n", "\n", - "from matplotlib import rcParams\n", - "rcParams['text.usetex'] = True\n", + "# from matplotlib import rcParams\n", + "# rcParams['text.usetex'] = False\n", "# rcParams['text.latex.preamble'] = r'\\usepackage{{amsmath}}'\n", "plt.ion()\n", "\n", @@ -30,7 +30,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 2, "metadata": {}, "outputs": [], "source": [ @@ -45,7 +45,7 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "55e446950f9749c580c39a21554c94c4", + "model_id": "1dfd7067a6844e0d885128ed8a4c0e1e", "version_major": 2, "version_minor": 0 }, @@ -69,7 +69,9 @@ "# sig12=1.2,\n", "# sig21=1.2,\n", "# sig22=1.3)\n", - "# ax[0].text(-5, 12, tex, size=20,color='black')\n", + "ax[0].text(-5, 12, '$\\Sigma$', size=20,color='black')\n", + "ax[0].text(-1, 12, '{sig11:.2f} & {sig12:.2f} \\\\ {sig21:.2f} & {sig22:.2f}'.format, size=20,color='black')\n", + "\n", "fig.canvas.toolbar_visible = False\n", "\n", "plt.show()" diff --git a/postBuild b/postBuild deleted file mode 100644 index ce0032c..0000000 --- a/postBuild +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -# run matplotlib once to generate the font cache -python -c "import matplotlib as mpl; mpl.use('Agg'); import pylab as plt; fig, ax = plt.subplots(); fig.savefig('test.png')" - -test -e test.png && rm test.png - -# install JupyterLab extension -# jupyter labextension install @jupyterlab/latex diff --git a/requirements.txt b/requirements.txt index 2d386b0..ac1f949 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,5 +5,3 @@ pandas ipywidgets>=7.5.1 ipympl==0.5.8 voila -tornado>=6.0.4 -