no commit message

parent 4a729d6a
...@@ -48,9 +48,10 @@ ...@@ -48,9 +48,10 @@
"## 0 Récuperation des données\n", "## 0 Récuperation des données\n",
"Des valeurs obtenues par numérisation du graphe sont aujourd'hui téléchargeables, avec la version en format CSV sur [ce site](https://raw.githubusercontent.com/vincentarelbundock/Rdatasets/master/csv/HistData/Wheat.csv).\n", "Des valeurs obtenues par numérisation du graphe sont aujourd'hui téléchargeables, avec la version en format CSV sur [ce site](https://raw.githubusercontent.com/vincentarelbundock/Rdatasets/master/csv/HistData/Wheat.csv).\n",
"\n", "\n",
"1. Déposer le fichier csv en locale si ce fichier local n'existe pas. \n", "- Déposer le fichier csv en locale si ce fichier local n'existe pas. \n",
"\n", "\n",
"2. Lisez le fichier CSV local." "\n",
"- Lisez le fichier CSV local."
] ]
}, },
{ {
...@@ -634,14 +635,14 @@ ...@@ -634,14 +635,14 @@
"metadata": {}, "metadata": {},
"source": [ "source": [
"## 2 Amélioration de la présentation\n", "## 2 Amélioration de la présentation\n",
"1. Utiliser plutôt les unités modernes pour les deux quantités :\n", "- Utiliser plutôt les unités modernes pour les deux quantités :\n",
"\n", "\n",
" 1) Pour le prix du blé, 1 shillings pour un quart de boisseau de blé = (1/20) £ / 6.8kg = 0.00735 £/kg \n", " 1) Pour le prix du blé, 1 shillings pour un quart de boisseau de blé = (1/20) £ / 6.8kg = 0.00735 £/kg \n",
" \n", " \n",
" 2) Pour les salaires, 1 shilling par semaine = (1/20)£ /semaine = 0.05 £ / semaine\n", " 2) Pour les salaires, 1 shilling par semaine = (1/20)£ /semaine = 0.05 £ / semaine\n",
" \n", " \n",
"\n", "\n",
"2. Transfomer les données et les sauvegarder dans un nouveau dataframe" "- Transfomer les données et les sauvegarder dans un nouveau dataframe"
] ]
}, },
{ {
...@@ -729,7 +730,7 @@ ...@@ -729,7 +730,7 @@
"\n", "\n",
"### 3.1 Mission 1\n", "### 3.1 Mission 1\n",
"\n", "\n",
"1. Définir comme la quantité de blé qu'un ouvrier peut acheter avec son salaire hebdomadaire.\n", "- Définir comme la quantité de blé qu'un ouvrier peut acheter avec son salaire hebdomadaire.\n",
"\n", "\n",
" Sauvegarder cette quantité *PurchasingPower* dans le dataframe *transf_data* et supprimer les années où il manque des infos sur les salaires." " Sauvegarder cette quantité *PurchasingPower* dans le dataframe *transf_data* et supprimer les années où il manque des infos sur les salaires."
] ]
...@@ -738,510 +739,17 @@ ...@@ -738,510 +739,17 @@
"cell_type": "code", "cell_type": "code",
"execution_count": 7, "execution_count": 7,
"metadata": {}, "metadata": {},
"outputs": [ "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>Unnamed: 0</th>\n",
" <th>Year</th>\n",
" <th>Wheat</th>\n",
" <th>Wages</th>\n",
" <th>PurchasingPower</th>\n",
" </tr>\n",
" </thead>\n",
" <tbody>\n",
" <tr>\n",
" <th>0</th>\n",
" <td>1</td>\n",
" <td>1565</td>\n",
" <td>0.301350</td>\n",
" <td>0.2500</td>\n",
" <td>0.829600</td>\n",
" </tr>\n",
" <tr>\n",
" <th>1</th>\n",
" <td>2</td>\n",
" <td>1570</td>\n",
" <td>0.330750</td>\n",
" <td>0.2525</td>\n",
" <td>0.763416</td>\n",
" </tr>\n",
" <tr>\n",
" <th>2</th>\n",
" <td>3</td>\n",
" <td>1575</td>\n",
" <td>0.308700</td>\n",
" <td>0.2540</td>\n",
" <td>0.822805</td>\n",
" </tr>\n",
" <tr>\n",
" <th>3</th>\n",
" <td>4</td>\n",
" <td>1580</td>\n",
" <td>0.360150</td>\n",
" <td>0.2560</td>\n",
" <td>0.710815</td>\n",
" </tr>\n",
" <tr>\n",
" <th>4</th>\n",
" <td>5</td>\n",
" <td>1585</td>\n",
" <td>0.305025</td>\n",
" <td>0.2575</td>\n",
" <td>0.844193</td>\n",
" </tr>\n",
" <tr>\n",
" <th>5</th>\n",
" <td>6</td>\n",
" <td>1590</td>\n",
" <td>0.345450</td>\n",
" <td>0.2625</td>\n",
" <td>0.759878</td>\n",
" </tr>\n",
" <tr>\n",
" <th>6</th>\n",
" <td>7</td>\n",
" <td>1595</td>\n",
" <td>0.470400</td>\n",
" <td>0.2770</td>\n",
" <td>0.588861</td>\n",
" </tr>\n",
" <tr>\n",
" <th>7</th>\n",
" <td>8</td>\n",
" <td>1600</td>\n",
" <td>0.198450</td>\n",
" <td>0.2805</td>\n",
" <td>1.413454</td>\n",
" </tr>\n",
" <tr>\n",
" <th>8</th>\n",
" <td>9</td>\n",
" <td>1605</td>\n",
" <td>0.242550</td>\n",
" <td>0.2845</td>\n",
" <td>1.172954</td>\n",
" </tr>\n",
" <tr>\n",
" <th>9</th>\n",
" <td>10</td>\n",
" <td>1610</td>\n",
" <td>0.235200</td>\n",
" <td>0.2890</td>\n",
" <td>1.228741</td>\n",
" </tr>\n",
" <tr>\n",
" <th>10</th>\n",
" <td>11</td>\n",
" <td>1615</td>\n",
" <td>0.242550</td>\n",
" <td>0.2970</td>\n",
" <td>1.224490</td>\n",
" </tr>\n",
" <tr>\n",
" <th>11</th>\n",
" <td>12</td>\n",
" <td>1620</td>\n",
" <td>0.257250</td>\n",
" <td>0.3005</td>\n",
" <td>1.168124</td>\n",
" </tr>\n",
" <tr>\n",
" <th>12</th>\n",
" <td>13</td>\n",
" <td>1625</td>\n",
" <td>0.242550</td>\n",
" <td>0.3060</td>\n",
" <td>1.261596</td>\n",
" </tr>\n",
" <tr>\n",
" <th>13</th>\n",
" <td>14</td>\n",
" <td>1630</td>\n",
" <td>0.330750</td>\n",
" <td>0.3110</td>\n",
" <td>0.940287</td>\n",
" </tr>\n",
" <tr>\n",
" <th>14</th>\n",
" <td>15</td>\n",
" <td>1635</td>\n",
" <td>0.242550</td>\n",
" <td>0.3150</td>\n",
" <td>1.298701</td>\n",
" </tr>\n",
" <tr>\n",
" <th>15</th>\n",
" <td>16</td>\n",
" <td>1640</td>\n",
" <td>0.286650</td>\n",
" <td>0.3185</td>\n",
" <td>1.111111</td>\n",
" </tr>\n",
" <tr>\n",
" <th>16</th>\n",
" <td>17</td>\n",
" <td>1645</td>\n",
" <td>0.389550</td>\n",
" <td>0.3225</td>\n",
" <td>0.827878</td>\n",
" </tr>\n",
" <tr>\n",
" <th>17</th>\n",
" <td>18</td>\n",
" <td>1650</td>\n",
" <td>0.308700</td>\n",
" <td>0.3250</td>\n",
" <td>1.052802</td>\n",
" </tr>\n",
" <tr>\n",
" <th>18</th>\n",
" <td>19</td>\n",
" <td>1655</td>\n",
" <td>0.297675</td>\n",
" <td>0.3300</td>\n",
" <td>1.108592</td>\n",
" </tr>\n",
" <tr>\n",
" <th>19</th>\n",
" <td>20</td>\n",
" <td>1660</td>\n",
" <td>0.341775</td>\n",
" <td>0.3375</td>\n",
" <td>0.987492</td>\n",
" </tr>\n",
" <tr>\n",
" <th>20</th>\n",
" <td>21</td>\n",
" <td>1665</td>\n",
" <td>0.235200</td>\n",
" <td>0.3400</td>\n",
" <td>1.445578</td>\n",
" </tr>\n",
" <tr>\n",
" <th>21</th>\n",
" <td>22</td>\n",
" <td>1670</td>\n",
" <td>0.271950</td>\n",
" <td>0.3450</td>\n",
" <td>1.268616</td>\n",
" </tr>\n",
" <tr>\n",
" <th>22</th>\n",
" <td>23</td>\n",
" <td>1675</td>\n",
" <td>0.316050</td>\n",
" <td>0.3500</td>\n",
" <td>1.107420</td>\n",
" </tr>\n",
" <tr>\n",
" <th>23</th>\n",
" <td>24</td>\n",
" <td>1680</td>\n",
" <td>0.257250</td>\n",
" <td>0.3650</td>\n",
" <td>1.418853</td>\n",
" </tr>\n",
" <tr>\n",
" <th>24</th>\n",
" <td>25</td>\n",
" <td>1685</td>\n",
" <td>0.198450</td>\n",
" <td>0.3800</td>\n",
" <td>1.914840</td>\n",
" </tr>\n",
" <tr>\n",
" <th>25</th>\n",
" <td>26</td>\n",
" <td>1690</td>\n",
" <td>0.294000</td>\n",
" <td>0.4000</td>\n",
" <td>1.360544</td>\n",
" </tr>\n",
" <tr>\n",
" <th>26</th>\n",
" <td>27</td>\n",
" <td>1695</td>\n",
" <td>0.367500</td>\n",
" <td>0.4250</td>\n",
" <td>1.156463</td>\n",
" </tr>\n",
" <tr>\n",
" <th>27</th>\n",
" <td>28</td>\n",
" <td>1700</td>\n",
" <td>0.220500</td>\n",
" <td>0.4500</td>\n",
" <td>2.040816</td>\n",
" </tr>\n",
" <tr>\n",
" <th>28</th>\n",
" <td>29</td>\n",
" <td>1705</td>\n",
" <td>0.235200</td>\n",
" <td>0.5000</td>\n",
" <td>2.125850</td>\n",
" </tr>\n",
" <tr>\n",
" <th>29</th>\n",
" <td>30</td>\n",
" <td>1710</td>\n",
" <td>0.323400</td>\n",
" <td>0.5500</td>\n",
" <td>1.700680</td>\n",
" </tr>\n",
" <tr>\n",
" <th>30</th>\n",
" <td>31</td>\n",
" <td>1715</td>\n",
" <td>0.242550</td>\n",
" <td>0.5875</td>\n",
" <td>2.422181</td>\n",
" </tr>\n",
" <tr>\n",
" <th>31</th>\n",
" <td>32</td>\n",
" <td>1720</td>\n",
" <td>0.213150</td>\n",
" <td>0.6250</td>\n",
" <td>2.932207</td>\n",
" </tr>\n",
" <tr>\n",
" <th>32</th>\n",
" <td>33</td>\n",
" <td>1725</td>\n",
" <td>0.286650</td>\n",
" <td>0.6500</td>\n",
" <td>2.267574</td>\n",
" </tr>\n",
" <tr>\n",
" <th>33</th>\n",
" <td>34</td>\n",
" <td>1730</td>\n",
" <td>0.191100</td>\n",
" <td>0.6650</td>\n",
" <td>3.479853</td>\n",
" </tr>\n",
" <tr>\n",
" <th>34</th>\n",
" <td>35</td>\n",
" <td>1735</td>\n",
" <td>0.235200</td>\n",
" <td>0.6800</td>\n",
" <td>2.891156</td>\n",
" </tr>\n",
" <tr>\n",
" <th>35</th>\n",
" <td>36</td>\n",
" <td>1740</td>\n",
" <td>0.198450</td>\n",
" <td>0.7000</td>\n",
" <td>3.527337</td>\n",
" </tr>\n",
" <tr>\n",
" <th>36</th>\n",
" <td>37</td>\n",
" <td>1745</td>\n",
" <td>0.202125</td>\n",
" <td>0.7250</td>\n",
" <td>3.586889</td>\n",
" </tr>\n",
" <tr>\n",
" <th>37</th>\n",
" <td>38</td>\n",
" <td>1750</td>\n",
" <td>0.227850</td>\n",
" <td>0.7500</td>\n",
" <td>3.291639</td>\n",
" </tr>\n",
" <tr>\n",
" <th>38</th>\n",
" <td>39</td>\n",
" <td>1755</td>\n",
" <td>0.260925</td>\n",
" <td>0.7850</td>\n",
" <td>3.008527</td>\n",
" </tr>\n",
" <tr>\n",
" <th>39</th>\n",
" <td>40</td>\n",
" <td>1760</td>\n",
" <td>0.227850</td>\n",
" <td>0.8250</td>\n",
" <td>3.620803</td>\n",
" </tr>\n",
" <tr>\n",
" <th>40</th>\n",
" <td>41</td>\n",
" <td>1765</td>\n",
" <td>0.316050</td>\n",
" <td>0.8800</td>\n",
" <td>2.784370</td>\n",
" </tr>\n",
" <tr>\n",
" <th>41</th>\n",
" <td>42</td>\n",
" <td>1770</td>\n",
" <td>0.345450</td>\n",
" <td>0.9250</td>\n",
" <td>2.677667</td>\n",
" </tr>\n",
" <tr>\n",
" <th>42</th>\n",
" <td>43</td>\n",
" <td>1775</td>\n",
" <td>0.323400</td>\n",
" <td>0.9750</td>\n",
" <td>3.014842</td>\n",
" </tr>\n",
" <tr>\n",
" <th>43</th>\n",
" <td>44</td>\n",
" <td>1780</td>\n",
" <td>0.338100</td>\n",
" <td>1.0500</td>\n",
" <td>3.105590</td>\n",
" </tr>\n",
" <tr>\n",
" <th>44</th>\n",
" <td>45</td>\n",
" <td>1785</td>\n",
" <td>0.308700</td>\n",
" <td>1.1500</td>\n",
" <td>3.725300</td>\n",
" </tr>\n",
" <tr>\n",
" <th>45</th>\n",
" <td>46</td>\n",
" <td>1790</td>\n",
" <td>0.349125</td>\n",
" <td>1.2750</td>\n",
" <td>3.651987</td>\n",
" </tr>\n",
" <tr>\n",
" <th>46</th>\n",
" <td>47</td>\n",
" <td>1795</td>\n",
" <td>0.558600</td>\n",
" <td>1.3750</td>\n",
" <td>2.461511</td>\n",
" </tr>\n",
" <tr>\n",
" <th>47</th>\n",
" <td>48</td>\n",
" <td>1800</td>\n",
" <td>0.580650</td>\n",
" <td>1.4250</td>\n",
" <td>2.454146</td>\n",
" </tr>\n",
" <tr>\n",
" <th>48</th>\n",
" <td>49</td>\n",
" <td>1805</td>\n",
" <td>0.595350</td>\n",
" <td>1.4750</td>\n",
" <td>2.477534</td>\n",
" </tr>\n",
" <tr>\n",
" <th>49</th>\n",
" <td>50</td>\n",
" <td>1810</td>\n",
" <td>0.727650</td>\n",
" <td>1.5000</td>\n",
" <td>2.061431</td>\n",
" </tr>\n",
" </tbody>\n",
"</table>\n",
"</div>"
],
"text/plain": [
" Unnamed: 0 Year Wheat Wages PurchasingPower\n",
"0 1 1565 0.301350 0.2500 0.829600\n",
"1 2 1570 0.330750 0.2525 0.763416\n",
"2 3 1575 0.308700 0.2540 0.822805\n",
"3 4 1580 0.360150 0.2560 0.710815\n",
"4 5 1585 0.305025 0.2575 0.844193\n",
"5 6 1590 0.345450 0.2625 0.759878\n",
"6 7 1595 0.470400 0.2770 0.588861\n",
"7 8 1600 0.198450 0.2805 1.413454\n",
"8 9 1605 0.242550 0.2845 1.172954\n",
"9 10 1610 0.235200 0.2890 1.228741\n",
"10 11 1615 0.242550 0.2970 1.224490\n",
"11 12 1620 0.257250 0.3005 1.168124\n",
"12 13 1625 0.242550 0.3060 1.261596\n",
"13 14 1630 0.330750 0.3110 0.940287\n",
"14 15 1635 0.242550 0.3150 1.298701\n",
"15 16 1640 0.286650 0.3185 1.111111\n",
"16 17 1645 0.389550 0.3225 0.827878\n",
"17 18 1650 0.308700 0.3250 1.052802\n",
"18 19 1655 0.297675 0.3300 1.108592\n",
"19 20 1660 0.341775 0.3375 0.987492\n",
"20 21 1665 0.235200 0.3400 1.445578\n",
"21 22 1670 0.271950 0.3450 1.268616\n",
"22 23 1675 0.316050 0.3500 1.107420\n",
"23 24 1680 0.257250 0.3650 1.418853\n",
"24 25 1685 0.198450 0.3800 1.914840\n",
"25 26 1690 0.294000 0.4000 1.360544\n",
"26 27 1695 0.367500 0.4250 1.156463\n",
"27 28 1700 0.220500 0.4500 2.040816\n",
"28 29 1705 0.235200 0.5000 2.125850\n",
"29 30 1710 0.323400 0.5500 1.700680\n",
"30 31 1715 0.242550 0.5875 2.422181\n",
"31 32 1720 0.213150 0.6250 2.932207\n",
"32 33 1725 0.286650 0.6500 2.267574\n",
"33 34 1730 0.191100 0.6650 3.479853\n",
"34 35 1735 0.235200 0.6800 2.891156\n",
"35 36 1740 0.198450 0.7000 3.527337\n",
"36 37 1745 0.202125 0.7250 3.586889\n",
"37 38 1750 0.227850 0.7500 3.291639\n",
"38 39 1755 0.260925 0.7850 3.008527\n",
"39 40 1760 0.227850 0.8250 3.620803\n",
"40 41 1765 0.316050 0.8800 2.784370\n",
"41 42 1770 0.345450 0.9250 2.677667\n",
"42 43 1775 0.323400 0.9750 3.014842\n",
"43 44 1780 0.338100 1.0500 3.105590\n",
"44 45 1785 0.308700 1.1500 3.725300\n",
"45 46 1790 0.349125 1.2750 3.651987\n",
"46 47 1795 0.558600 1.3750 2.461511\n",
"47 48 1800 0.580650 1.4250 2.454146\n",
"48 49 1805 0.595350 1.4750 2.477534\n",
"49 50 1810 0.727650 1.5000 2.061431"
]
},
"execution_count": 7,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [ "source": [
"transf_data['PurchasingPower'] = transf_data['Wages'] / transf_data['Wheat']\n", "transf_data['PurchasingPower'] = transf_data['Wages'] / transf_data['Wheat']\n",
"transf_data = transf_data.dropna().copy()\n", "transf_data = transf_data.dropna().copy()"
"transf_data"
] ]
}, },
{ {
"cell_type": "markdown", "cell_type": "markdown",
"metadata": {}, "metadata": {},
"source": [ "source": [
"2. Faire une représentation graphique du pouvoir d'achat au cours du temps." "- Faire une représentation graphique du pouvoir d'achat au cours du temps."
] ]
}, },
{ {
...@@ -1311,7 +819,7 @@ ...@@ -1311,7 +819,7 @@
"cell_type": "markdown", "cell_type": "markdown",
"metadata": {}, "metadata": {},
"source": [ "source": [
"3. Remarques\n", "- Remarques\n",
"\n", "\n",
" 1) Il y a évidement une grande augmentation du pouvoir d'achat au travers du 17ème siècle, qui montre d'environ **1.0 kg** du blé par les salaires hebdomentaires à plus de **3.0 kg**. \n", " 1) Il y a évidement une grande augmentation du pouvoir d'achat au travers du 17ème siècle, qui montre d'environ **1.0 kg** du blé par les salaires hebdomentaires à plus de **3.0 kg**. \n",
"\n", "\n",
...@@ -1323,10 +831,11 @@ ...@@ -1323,10 +831,11 @@
"metadata": {}, "metadata": {},
"source": [ "source": [
"### 3.2 Mission 2\n", "### 3.2 Mission 2\n",
"1. Montrez les deux quantités (prix du blé, salaire) sur deux axes différents, sans l'axe du temps. \n", "\n",
"- Montrez les deux quantités (prix du blé, salaire) sur deux axes différents, sans l'axe du temps. \n",
"\n", "\n",
"\n", "\n",
"2. Trouvez une autre façon d'indiquer la progression du temps dans ce graphique.\n", "- Trouvez une autre façon d'indiquer la progression du temps dans ce graphique.\n",
"\n", "\n",
" **Proposition** : La progression du temps est présentée par la couleur des points, dans la figure ci-dessous. " " **Proposition** : La progression du temps est présentée par la couleur des points, dans la figure ci-dessous. "
] ]
...@@ -1391,7 +900,7 @@ ...@@ -1391,7 +900,7 @@
"cell_type": "markdown", "cell_type": "markdown",
"metadata": {}, "metadata": {},
"source": [ "source": [
"3. Remarques\n", "- Remarques\n",
"\n", "\n",
" 1) La progression du temps est présentée par la couleur des *points*, de la couleur bleu à la rouge.\n", " 1) La progression du temps est présentée par la couleur des *points*, de la couleur bleu à la rouge.\n",
"\n", "\n",
......
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