diff --git a/exercises/tabular_join/tabular_join.ipynb b/exercises/tabular_join/tabular_join.ipynb index 6cf3ed9..9e9640a 100644 --- a/exercises/tabular_join/tabular_join.ipynb +++ b/exercises/tabular_join/tabular_join.ipynb @@ -326,12 +326,24 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 6, "id": "861ac334-14ce-490a-b3c4-877b32789f3e", "metadata": {}, - "outputs": [], + "outputs": [ + { + "data": { + "text/plain": [ + "(6324, 16)" + ] + }, + "execution_count": 6, + "metadata": {}, + "output_type": "execute_result" + } + ], "source": [ - "## your code here\n" + "## your code here\n", + "df.shape" ] }, { @@ -344,12 +356,24 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 7, "id": "14f57842-5722-4953-88d6-d7cf3070400c", "metadata": {}, - "outputs": [], + "outputs": [ + { + "data": { + "text/plain": [ + "(6287, 3)" + ] + }, + "execution_count": 7, + "metadata": {}, + "output_type": "execute_result" + } + ], "source": [ - "## your code here\n" + "## your code here\n", + "info.shape" ] }, { @@ -364,14 +388,13 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 10, "id": "35e19a53", "metadata": {}, "outputs": [], "source": [ "## your code here\n", - "\n", - "\n" + "data_diet = pd.merge(df, info, how='inner', left_on=['location-id', 'patient-id'], right_on=['location-id', 'patient-id'])" ] }, { @@ -388,7 +411,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 9, "id": "36ce0688-d421-4a07-b00e-0e9b3201f0e0", "metadata": {}, "outputs": [ @@ -456,7 +479,7 @@ "4 5 Malaga" ] }, - "execution_count": 8, + "execution_count": 9, "metadata": {}, "output_type": "execute_result" } @@ -469,12 +492,195 @@ }, { "cell_type": "code", - "execution_count": 9, + "execution_count": 11, "id": "b636dde4-129a-4dd1-8cbf-c539c9c8a5f2", "metadata": {}, "outputs": [], "source": [ - "## your code here:\n" + "## your code here:\n", + "data_diet_loc = pd.merge(data_diet, locations, how='inner', left_on='location-id', right_on='location-id')" + ] + }, + { + "cell_type": "code", + "execution_count": 23, + "id": "e4579355-bdde-40a3-8969-1c27c7bb0eb7", + "metadata": {}, + "outputs": [ + { + "data": { + "text/html": [ + "
\n", + " | patient-id | \n", + "location-id | \n", + "sex | \n", + "age | \n", + "smoke | \n", + "bmi | \n", + "waist | \n", + "wth | \n", + "htn | \n", + "diab | \n", + "hyperchol | \n", + "famhist | \n", + "hormo | \n", + "p14 | \n", + "toevent | \n", + "event | \n", + "group | \n", + "City | \n", + "
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
0 | \n", + "436 | \n", + "4 | \n", + "Male | \n", + "58 | \n", + "Former | \n", + "33.53 | \n", + "122 | \n", + "0.753086 | \n", + "No | \n", + "No | \n", + "Yes | \n", + "No | \n", + "No | \n", + "10 | \n", + "5.374401 | \n", + "Yes | \n", + "Control | \n", + "Bilbao | \n", + "
1 | \n", + "1130 | \n", + "4 | \n", + "Male | \n", + "77 | \n", + "Current | \n", + "31.05 | \n", + "119 | \n", + "0.730061 | \n", + "Yes | \n", + "Yes | \n", + "No | \n", + "No | \n", + "No | \n", + "10 | \n", + "6.097194 | \n", + "No | \n", + "Control | \n", + "Bilbao | \n", + "
2 | \n", + "1131 | \n", + "4 | \n", + "Female | \n", + "72 | \n", + "Former | \n", + "30.86 | \n", + "106 | \n", + "0.654321 | \n", + "No | \n", + "Yes | \n", + "No | \n", + "Yes | \n", + "No | \n", + "8 | \n", + "5.946612 | \n", + "No | \n", + "MedDiet + VOO | \n", + "Bilbao | \n", + "
3 | \n", + "1132 | \n", + "4 | \n", + "Male | \n", + "71 | \n", + "Former | \n", + "27.68 | \n", + "118 | \n", + "0.694118 | \n", + "Yes | \n", + "No | \n", + "Yes | \n", + "No | \n", + "No | \n", + "8 | \n", + "2.907598 | \n", + "Yes | \n", + "MedDiet + Nuts | \n", + "Bilbao | \n", + "
4 | \n", + "1111 | \n", + "2 | \n", + "Female | \n", + "79 | \n", + "Never | \n", + "35.94 | \n", + "129 | \n", + "0.806250 | \n", + "Yes | \n", + "No | \n", + "Yes | \n", + "No | \n", + "No | \n", + "9 | \n", + "4.761123 | \n", + "No | \n", + "MedDiet + VOO | \n", + "Valencia | \n", + "