From b03b9d31b8d88a31d3b3c29a4c0dbd270ef50b88 Mon Sep 17 00:00:00 2001
From: cb1e5ba91280d02583d0604166e71c1c
 <cb1e5ba91280d02583d0604166e71c1c@app-learninglab.inria.fr>
Date: Tue, 7 Apr 2020 13:31:51 +0000
Subject: [PATCH] no commit message

---
 module3/exo3/exercice.ipynb | 149 ++++++++++++++++++++++++++++++++++--
 1 file changed, 142 insertions(+), 7 deletions(-)

diff --git a/module3/exo3/exercice.ipynb b/module3/exo3/exercice.ipynb
index 4f4932b..e58a355 100644
--- a/module3/exo3/exercice.ipynb
+++ b/module3/exo3/exercice.ipynb
@@ -2063,7 +2063,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 325,
+   "execution_count": 327,
    "metadata": {
     "hideCode": true,
     "hidePrompt": true,
@@ -2072,11 +2072,148 @@
    "outputs": [
     {
      "data": {
+      "text/html": [
+       "<div>\n",
+       "<style scoped>\n",
+       "    .dataframe tbody tr th:only-of-type {\n",
+       "        vertical-align: middle;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe tbody tr th {\n",
+       "        vertical-align: top;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe thead th {\n",
+       "        text-align: right;\n",
+       "    }\n",
+       "</style>\n",
+       "<table border=\"1\" class=\"dataframe\">\n",
+       "  <thead>\n",
+       "    <tr style=\"text-align: right;\">\n",
+       "      <th></th>\n",
+       "      <th>Data 2</th>\n",
+       "      <th>Mn</th>\n",
+       "      <th>Yr</th>\n",
+       "    </tr>\n",
+       "  </thead>\n",
+       "  <tbody>\n",
+       "    <tr>\n",
+       "      <th>2020-01-01</th>\n",
+       "      <td>2020.0410</td>\n",
+       "      <td>1</td>\n",
+       "      <td>2020</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2020-02-01</th>\n",
+       "      <td>2020.1257</td>\n",
+       "      <td>2</td>\n",
+       "      <td>2020</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2020-03-01</th>\n",
+       "      <td>2020.2049</td>\n",
+       "      <td>3</td>\n",
+       "      <td>2020</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2020-04-01</th>\n",
+       "      <td>2020.2896</td>\n",
+       "      <td>4</td>\n",
+       "      <td>2020</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2020-05-01</th>\n",
+       "      <td>2020.3716</td>\n",
+       "      <td>5</td>\n",
+       "      <td>2020</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2020-06-01</th>\n",
+       "      <td>2020.4563</td>\n",
+       "      <td>6</td>\n",
+       "      <td>2020</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2020-07-01</th>\n",
+       "      <td>2020.5383</td>\n",
+       "      <td>7</td>\n",
+       "      <td>2020</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>...</th>\n",
+       "      <td>...</td>\n",
+       "      <td>...</td>\n",
+       "      <td>...</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2025-06-01</th>\n",
+       "      <td>2025.4548</td>\n",
+       "      <td>6</td>\n",
+       "      <td>2025</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2025-07-01</th>\n",
+       "      <td>2025.5370</td>\n",
+       "      <td>7</td>\n",
+       "      <td>2025</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2025-08-01</th>\n",
+       "      <td>2025.6219</td>\n",
+       "      <td>8</td>\n",
+       "      <td>2025</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2025-09-01</th>\n",
+       "      <td>2025.7068</td>\n",
+       "      <td>9</td>\n",
+       "      <td>2025</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2025-10-01</th>\n",
+       "      <td>2025.7890</td>\n",
+       "      <td>10</td>\n",
+       "      <td>2025</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2025-11-01</th>\n",
+       "      <td>2025.8740</td>\n",
+       "      <td>11</td>\n",
+       "      <td>2025</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2025-12-01</th>\n",
+       "      <td>2025.9562</td>\n",
+       "      <td>12</td>\n",
+       "      <td>2025</td>\n",
+       "    </tr>\n",
+       "  </tbody>\n",
+       "</table>\n",
+       "<p>72 rows × 3 columns</p>\n",
+       "</div>"
+      ],
       "text/plain": [
-       "2025"
+       "               Data 2  Mn    Yr\n",
+       "2020-01-01  2020.0410   1  2020\n",
+       "2020-02-01  2020.1257   2  2020\n",
+       "2020-03-01  2020.2049   3  2020\n",
+       "2020-04-01  2020.2896   4  2020\n",
+       "2020-05-01  2020.3716   5  2020\n",
+       "2020-06-01  2020.4563   6  2020\n",
+       "2020-07-01  2020.5383   7  2020\n",
+       "...               ...  ..   ...\n",
+       "2025-06-01  2025.4548   6  2025\n",
+       "2025-07-01  2025.5370   7  2025\n",
+       "2025-08-01  2025.6219   8  2025\n",
+       "2025-09-01  2025.7068   9  2025\n",
+       "2025-10-01  2025.7890  10  2025\n",
+       "2025-11-01  2025.8740  11  2025\n",
+       "2025-12-01  2025.9562  12  2025\n",
+       "\n",
+       "[72 rows x 3 columns]"
       ]
      },
-     "execution_count": 325,
+     "execution_count": 327,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -2093,11 +2230,9 @@
     "s = []         # oblication d'initialiser ....\n",
     "[s.extend(list(an_n)) if i%4!=0 else s.extend(list(an_b))  for i in np.arange(ymj_fin.year- year[0]+1)]\n",
     "Data2 = pd.Series(s,index = per1)\n",
-    "dfa = pd.DataFrame({'Yr' : Yr,'Mn' : Mn,'Data 2' : Data2})\n",
+    "dfa = pd.DataFrame({'Yr' : Yr,'Mn' : Mn,'Data 2' : Data2 + Yr})\n",
     "#dfa = pd.DataFrame({'Data2' : Data2})\n",
-    "dfa\n",
-    "ymj_fin.year\n",
-    "\n"
+    "dfa"
    ]
   },
   {
-- 
2.18.1