Modifications mineures.

parent 70b047ae
...@@ -492,11 +492,42 @@ ...@@ -492,11 +492,42 @@
"name": "stdout", "name": "stdout",
"output_type": "stream", "output_type": "stream",
"text": [ "text": [
"Requirement already satisfied: lmfit in /opt/conda/lib/python3.6/site-packages (1.0.0)\r\n", "Collecting lmfit\n",
"Requirement already satisfied: asteval>=0.9.16 in /opt/conda/lib/python3.6/site-packages (from lmfit) (0.9.18)\r\n", " Downloading lmfit-1.0.0.tar.gz (258 kB)\n",
"Requirement already satisfied: numpy>=1.16 in /opt/conda/lib/python3.6/site-packages (from lmfit) (1.18.2)\r\n", "\u001b[K |████████████████████████████████| 258 kB 6.5 MB/s eta 0:00:01 |████████████████████████ | 194 kB 6.5 MB/s eta 0:00:01\n",
"Requirement already satisfied: scipy>=1.2 in /opt/conda/lib/python3.6/site-packages (from lmfit) (1.4.1)\r\n", "\u001b[?25hCollecting asteval>=0.9.16\n",
"Requirement already satisfied: uncertainties>=3.0.1 in /opt/conda/lib/python3.6/site-packages (from lmfit) (3.1.2)\r\n" " Downloading asteval-0.9.18.tar.gz (52 kB)\n",
"\u001b[K |████████████████████████████████| 52 kB 1.7 MB/s eta 0:00:01\n",
"\u001b[?25hCollecting numpy>=1.16\n",
" Downloading numpy-1.18.2-cp36-cp36m-manylinux1_x86_64.whl (20.2 MB)\n",
"\u001b[K |████████████████████████████████| 20.2 MB 23.4 MB/s eta 0:00:01 |██████████████▊ | 9.3 MB 23.4 MB/s eta 0:00:01 |███████████████████████████████ | 19.5 MB 23.4 MB/s eta 0:00:01\n",
"\u001b[?25hCollecting scipy>=1.2\n",
" Downloading scipy-1.4.1-cp36-cp36m-manylinux1_x86_64.whl (26.1 MB)\n",
"\u001b[K |████████████████████████████████| 26.1 MB 105 kB/s eta 0:00:01\n",
"\u001b[?25hCollecting uncertainties>=3.0.1\n",
" Downloading uncertainties-3.1.2.tar.gz (232 kB)\n",
"\u001b[K |████████████████████████████████| 232 kB 28.8 MB/s eta 0:00:01\n",
"\u001b[?25hBuilding wheels for collected packages: lmfit, asteval, uncertainties\n",
" Building wheel for lmfit (setup.py) ... \u001b[?25ldone\n",
"\u001b[?25h Created wheel for lmfit: filename=lmfit-1.0.0-py3-none-any.whl size=87914 sha256=d5e2ae79e81a2dbf074c0ef92cf392d1c67e5cd66d77e0ca72975f7ba8ec95a7\n",
" Stored in directory: /home/jovyan/.cache/pip/wheels/e2/c7/ed/ccfe7d5de2af8a029a77c9c54f4a592381977d42da50d6be7e\n",
" Building wheel for asteval (setup.py) ... \u001b[?25ldone\n",
"\u001b[?25h Created wheel for asteval: filename=asteval-0.9.18-py3-none-any.whl size=17382 sha256=b0540802373c4b0075a85a51ab68cfc26295866d0b8bdb4ef6e20b4eb849aecf\n",
" Stored in directory: /home/jovyan/.cache/pip/wheels/e4/91/a3/08d0c0afc17a193dc65245d605087dc1c8b2848ec70b18d545\n",
" Building wheel for uncertainties (setup.py) ... \u001b[?25ldone\n",
"\u001b[?25h Created wheel for uncertainties: filename=uncertainties-3.1.2-py3-none-any.whl size=96454 sha256=37e7eea39a33d617386dda15004f2a09c7ab191bb5f70a289b4259d6436d60c8\n",
" Stored in directory: /home/jovyan/.cache/pip/wheels/78/52/c1/1028f3e019b7ee67e1fe1ecfaa049c464aba5fc756acbd0dd0\n",
"Successfully built lmfit asteval uncertainties\n",
"Installing collected packages: asteval, numpy, scipy, uncertainties, lmfit\n",
" Attempting uninstall: numpy\n",
" Found existing installation: numpy 1.15.2\n",
" Uninstalling numpy-1.15.2:\n",
" Successfully uninstalled numpy-1.15.2\n",
" Attempting uninstall: scipy\n",
" Found existing installation: scipy 1.1.0\n",
" Uninstalling scipy-1.1.0:\n",
" Successfully uninstalled scipy-1.1.0\n",
"Successfully installed asteval-0.9.18 lmfit-1.0.0 numpy-1.18.2 scipy-1.4.1 uncertainties-3.1.2\n"
] ]
} }
], ],
...@@ -568,7 +599,7 @@ ...@@ -568,7 +599,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 37, "execution_count": 11,
"metadata": { "metadata": {
"hideCode": false, "hideCode": false,
"hideOutput": true, "hideOutput": true,
...@@ -686,7 +717,8 @@ ...@@ -686,7 +717,8 @@
"cell_type": "code", "cell_type": "code",
"execution_count": 16, "execution_count": 16,
"metadata": { "metadata": {
"hideCode": false, "hideCode": true,
"hideOutput": false,
"hidePrompt": true "hidePrompt": true
}, },
"outputs": [ "outputs": [
...@@ -786,7 +818,7 @@ ...@@ -786,7 +818,7 @@
{ {
"data": { "data": {
"text/plain": [ "text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7fa3f4fdc5c0>" "<matplotlib.axes._subplots.AxesSubplot at 0x7f49fe62dac8>"
] ]
}, },
"execution_count": 18, "execution_count": 18,
...@@ -866,7 +898,7 @@ ...@@ -866,7 +898,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 38, "execution_count": 21,
"metadata": { "metadata": {
"hideOutput": true, "hideOutput": true,
"hidePrompt": true "hidePrompt": true
...@@ -952,7 +984,7 @@ ...@@ -952,7 +984,7 @@
{ {
"data": { "data": {
"text/plain": [ "text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7fa3db000278>" "<matplotlib.axes._subplots.AxesSubplot at 0x7f49fe54bb38>"
] ]
}, },
"execution_count": 25, "execution_count": 25,
...@@ -1040,7 +1072,7 @@ ...@@ -1040,7 +1072,7 @@
{ {
"data": { "data": {
"text/plain": [ "text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7fa4041c7550>" "<matplotlib.axes._subplots.AxesSubplot at 0x7f4a28d930b8>"
] ]
}, },
"execution_count": 27, "execution_count": 27,
...@@ -1252,7 +1284,7 @@ ...@@ -1252,7 +1284,7 @@
{ {
"data": { "data": {
"text/plain": [ "text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7fa40643fdd8>" "<matplotlib.axes._subplots.AxesSubplot at 0x7f4a28a49470>"
] ]
}, },
"execution_count": 34, "execution_count": 34,
...@@ -1330,7 +1362,7 @@ ...@@ -1330,7 +1362,7 @@
{ {
"data": { "data": {
"text/plain": [ "text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7fa4043843c8>" "<matplotlib.axes._subplots.AxesSubplot at 0x7f4a28dbcf28>"
] ]
}, },
"execution_count": 36, "execution_count": 36,
...@@ -1376,7 +1408,7 @@ ...@@ -1376,7 +1408,7 @@
}, },
"source": [ "source": [
"Ci-dessus la prédiction pour l'année 2025 complète (courbe verte) et sa tendance à long terme (courbe orange). \n", "Ci-dessus la prédiction pour l'année 2025 complète (courbe verte) et sa tendance à long terme (courbe orange). \n",
"Pour assurer une bonne lisibilité du graphique, les intervalles de confiance (très étroits) ne sont pas représentés." "Pour assurer une bonne lisibilité du graphique, les intervalles de confiance (très restreints) ne sont pas représentés."
] ]
}, },
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment