diff --git a/module3/exo2/exercice.ipynb b/module3/exo2/exercice.ipynb index 286582a4504ce6499c167b49b2b6404aea3778a9..94ac5404577da645257ac8e99ba4613c7377e59c 100644 --- a/module3/exo2/exercice.ipynb +++ b/module3/exo2/exercice.ipynb @@ -3194,12 +3194,48 @@ "sorted_data" ] }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "### Choisir le 1er spetembre comme début de chaque période anuelle" + ] + }, { "cell_type": "code", - "execution_count": null, + "execution_count": 29, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "first_september_week = [pd.Period(pd.Timestamp(y, 9, 1), 'w')\n", + " for y in range(sorted_data.index[0].year,\n", + " sorted_data.index[-1].year)]" + ] + }, + { + "cell_type": "code", + "execution_count": 32, + "metadata": {}, + "outputs": [], + "source": [ + "year = []\n", + "yearly_incidence = []\n", + "for week1, week2 in zip(first_september_week[:-1],\n", + " first_september_week[1:]):\n", + " one_year = sorted_data['inc'][week1:week2-1]\n", + " yearly_incidence.append(one_year.sum())\n", + " year.append(week2.year)" + ] + }, + { + "cell_type": "code", + "execution_count": 33, + "metadata": {}, + "outputs": [], + "source": [ + "# Conertir en séries pandas\n", + "yearly_incidence = pd.Series(index = year, data = yearly_incidence)" + ] }, { "cell_type": "code", @@ -3224,37 +3260,25 @@ }, { "cell_type": "code", - "execution_count": 9, + "execution_count": 26, "metadata": {}, "outputs": [ { "ename": "NameError", - "evalue": "name 'sorted_data' is not defined", + "evalue": "name 'first_september_week' is not defined", "output_type": "error", "traceback": [ "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m", "\u001b[0;31mNameError\u001b[0m Traceback (most recent call last)", - "\u001b[0;32m\u001b[0m in \u001b[0;36m\u001b[0;34m\u001b[0m\n\u001b[1;32m 2\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 3\u001b[0m first_spetember_week = [pd.Period(pd.Timestamp(y, 9, 1), 'w')\n\u001b[0;32m----> 4\u001b[0;31m for y in range(sorted_data.index[0].year,\n\u001b[0m\u001b[1;32m 5\u001b[0m sorted_data.index[-1].year)]\n", - "\u001b[0;31mNameError\u001b[0m: name 'sorted_data' is not defined" + "\u001b[0;32m\u001b[0m in \u001b[0;36m\u001b[0;34m\u001b[0m\n\u001b[1;32m 8\u001b[0m \u001b[0myear\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0;34m[\u001b[0m\u001b[0;34m]\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 9\u001b[0m \u001b[0myearly_incidence\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0;34m[\u001b[0m\u001b[0;34m]\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m---> 10\u001b[0;31m for week1, week2 in zip(first_september_week[:-1],\n\u001b[0m\u001b[1;32m 11\u001b[0m first_september_week[1:]):\n\u001b[1;32m 12\u001b[0m \u001b[0mone_year\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0msorted_data\u001b[0m\u001b[0;34m[\u001b[0m\u001b[0;34m'inc'\u001b[0m\u001b[0;34m]\u001b[0m\u001b[0;34m[\u001b[0m\u001b[0mweek1\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0mweek2\u001b[0m\u001b[0;34m-\u001b[0m\u001b[0;36m1\u001b[0m\u001b[0;34m]\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n", + "\u001b[0;31mNameError\u001b[0m: name 'first_september_week' is not defined" ] } ], "source": [ - "# Choisir le 1er spetembre comme début de chaque période anuelle\n", - "\n", - "first_spetember_week = [pd.Period(pd.Timestamp(y, 9, 1), 'w')\n", - " for y in range(sorted_data.index[0].year,\n", - " sorted_data.index[-1].year)]\n", "\n", "\n", - "year = []\n", - "yearly_incidence = []\n", - "for week1, week2 in zip(first_september_week[:-1],\n", - " first_september_week[1:]):\n", - " one_year = sorted_data['inc'][week1:week2-1]\n", - " assert abs(len(one_year)-52) < 2\n", - " yearly_incidence.append(one_year.sum())\n", - " year.append(week2.year)" + "\n" ] }, {