diff --git a/synced_files/GA_1_7/Solution/Discharge/Analysis_discharge_solution.ipynb b/synced_files/GA_1_7/Solution/Discharge/Analysis_discharge_solution.ipynb index d09c35d47d773e17a3e506761a02df3531041c59..6350198110b12bf53c350b6baea10b8ca7febbc4 100644 --- a/synced_files/GA_1_7/Solution/Discharge/Analysis_discharge_solution.ipynb +++ b/synced_files/GA_1_7/Solution/Discharge/Analysis_discharge_solution.ipynb @@ -606,7 +606,11 @@ }, { "cell_type": "markdown", +<<<<<<< HEAD "id": "83f1916a", +======= + "id": "ff0514aa", +>>>>>>> main "metadata": {}, "source": [ "<div style=\"background-color:#FAE99E; color: black; width:95%; vertical-align: middle; padding:15px; margin: 10px; border-radius: 10px\">\n", diff --git a/synced_files/GA_1_7/Solution/Emissions/Analysis_emissions_solution.ipynb b/synced_files/GA_1_7/Solution/Emissions/Analysis_emissions_solution.ipynb index babcf09db2fdafc4b40f13ba1b1847cf59ed8022..b049f9f57309820a5753f593170be809b8e13820 100644 --- a/synced_files/GA_1_7/Solution/Emissions/Analysis_emissions_solution.ipynb +++ b/synced_files/GA_1_7/Solution/Emissions/Analysis_emissions_solution.ipynb @@ -159,7 +159,11 @@ }, { "cell_type": "markdown", +<<<<<<< HEAD "id": "fd5788a5", +======= + "id": "017d862d", +>>>>>>> main "metadata": {}, "source": [ "<div style=\"background-color:#FAE99E; color: black; width:95%; vertical-align: middle; padding:15px; margin: 10px; border-radius: 10px\">\n", @@ -262,7 +266,11 @@ }, { "cell_type": "markdown", +<<<<<<< HEAD "id": "56a4ebec", +======= + "id": "6832b090", +>>>>>>> main "metadata": {}, "source": [ "<div style=\"background-color:#FAE99E; color: black; width:95%; vertical-align: middle; padding:15px; margin: 10px; border-radius: 10px\">\n", @@ -374,7 +382,11 @@ { "cell_type": "code", "execution_count": null, +<<<<<<< HEAD "id": "0fc87c7e", +======= + "id": "614ab2ea", +>>>>>>> main "metadata": {}, "outputs": [], "source": [ @@ -437,7 +449,11 @@ }, { "cell_type": "markdown", +<<<<<<< HEAD "id": "13aaae96", +======= + "id": "63f2d1d7", +>>>>>>> main "metadata": {}, "source": [ "<div style=\"background-color:#FAE99E; color: black; width:95%; vertical-align: middle; padding:15px; margin: 10px; border-radius: 10px\">\n", @@ -538,7 +554,11 @@ }, { "cell_type": "markdown", +<<<<<<< HEAD "id": "f50cd37b", +======= + "id": "f78600e9", +>>>>>>> main "metadata": {}, "source": [ "<div style=\"background-color:#FAE99E; color: black; width:95%; vertical-align: middle; padding:15px; margin: 10px; border-radius: 10px\">\n", @@ -552,7 +572,11 @@ }, { "cell_type": "markdown", +<<<<<<< HEAD "id": "7286871b", +======= + "id": "6ae1e63d", +>>>>>>> main "metadata": {}, "source": [ "If you run the code in the cell below, you will obtain a scatter plot of both variables. Explore the relationship between both variables and answer the following questions:\n", @@ -573,7 +597,11 @@ { "cell_type": "code", "execution_count": null, +<<<<<<< HEAD "id": "644a3a9f", +======= + "id": "92c1d117", +>>>>>>> main "metadata": {}, "outputs": [], "source": [ @@ -589,7 +617,11 @@ { "cell_type": "code", "execution_count": null, +<<<<<<< HEAD "id": "748bac7a", +======= + "id": "2e8466db", +>>>>>>> main "metadata": {}, "outputs": [], "source": [ @@ -602,7 +634,11 @@ }, { "cell_type": "markdown", +<<<<<<< HEAD "id": "3626e421", +======= + "id": "3a5e7c3d", +>>>>>>> main "metadata": {}, "source": [ "<div style=\"background-color:#FAE99E; color: black; width:95%; vertical-align: middle; padding:15px; margin: 10px; border-radius: 10px\">\n", diff --git a/synced_files/GA_1_7/Solution/Force/Analysis_force_solution.ipynb b/synced_files/GA_1_7/Solution/Force/Analysis_force_solution.ipynb index 19c9f6ce3d8b303c799d827664f5c86efa8e2e95..5ba20aff6c7d29da00989f3c4aab09eb56f55172 100644 --- a/synced_files/GA_1_7/Solution/Force/Analysis_force_solution.ipynb +++ b/synced_files/GA_1_7/Solution/Force/Analysis_force_solution.ipynb @@ -164,7 +164,11 @@ }, { "cell_type": "markdown", +<<<<<<< HEAD "id": "a2f550c2", +======= + "id": "95f4424d", +>>>>>>> main "metadata": {}, "source": [ "<div style=\"background-color:#FAE99E; color: black; width:95%; vertical-align: middle; padding:15px; margin: 10px; border-radius: 10px\">\n", @@ -269,7 +273,11 @@ }, { "cell_type": "markdown", +<<<<<<< HEAD "id": "7a0283e9", +======= + "id": "d556d43a", +>>>>>>> main "metadata": {}, "source": [ "<div style=\"background-color:#FAE99E; color: black; width:95%; vertical-align: middle; padding:15px; margin: 10px; border-radius: 10px\">\n", @@ -382,7 +390,11 @@ { "cell_type": "code", "execution_count": null, +<<<<<<< HEAD "id": "e0841ce7", +======= + "id": "92e0488e", +>>>>>>> main "metadata": {}, "outputs": [], "source": [ @@ -445,7 +457,11 @@ }, { "cell_type": "markdown", +<<<<<<< HEAD "id": "ddc6a99e", +======= + "id": "cea5d210", +>>>>>>> main "metadata": {}, "source": [ "<div style=\"background-color:#FAE99E; color: black; width:95%; vertical-align: middle; padding:15px; margin: 10px; border-radius: 10px\">\n", @@ -546,7 +562,11 @@ }, { "cell_type": "markdown", +<<<<<<< HEAD "id": "9cacc08b", +======= + "id": "4f28f867", +>>>>>>> main "metadata": {}, "source": [ "<div style=\"background-color:#FAE99E; color: black; width:95%; vertical-align: middle; padding:15px; margin: 10px; border-radius: 10px\">\n", @@ -561,7 +581,11 @@ }, { "cell_type": "markdown", +<<<<<<< HEAD "id": "9c090cd4", +======= + "id": "a4cb272d", +>>>>>>> main "metadata": {}, "source": [ "If you run the code in the cell below, you will obtain a scatter plot of both variables. Explore the relationship between both variables and answer the following questions:\n", @@ -582,7 +606,11 @@ { "cell_type": "code", "execution_count": null, +<<<<<<< HEAD "id": "7be52b62", +======= + "id": "814a5374", +>>>>>>> main "metadata": {}, "outputs": [], "source": [ @@ -598,7 +626,11 @@ { "cell_type": "code", "execution_count": null, +<<<<<<< HEAD "id": "0ed13fc3", +======= + "id": "614d39df", +>>>>>>> main "metadata": {}, "outputs": [], "source": [ @@ -611,7 +643,11 @@ }, { "cell_type": "markdown", +<<<<<<< HEAD "id": "b8e75b62", +======= + "id": "31d9809b", +>>>>>>> main "metadata": {}, "source": [ "<div style=\"background-color:#FAE99E; color: black; width:95%; vertical-align: middle; padding:15px; margin: 10px; border-radius: 10px\">\n", diff --git a/synced_files/GA_1_7/Student/Discharge/Analysis_discharge.ipynb b/synced_files/GA_1_7/Student/Discharge/Analysis_discharge.ipynb index 6411287064c32b690f9b0d5c15b513b601f902d8..9d8718e8391fcc33ef8225967973bf8e98b81305 100644 --- a/synced_files/GA_1_7/Student/Discharge/Analysis_discharge.ipynb +++ b/synced_files/GA_1_7/Student/Discharge/Analysis_discharge.ipynb @@ -384,7 +384,11 @@ }, { "cell_type": "markdown", +<<<<<<< HEAD "id": "41279c3d", +======= + "id": "54765355", +>>>>>>> main "metadata": {}, "source": [ "If you run the code in the cell below, you will obtain a scatter plot of both variables. Explore the relationship between both variables and answer the following questions:\n", @@ -405,7 +409,11 @@ { "cell_type": "code", "execution_count": null, +<<<<<<< HEAD "id": "fa36c452", +======= + "id": "c5e64ef5", +>>>>>>> main "metadata": {}, "outputs": [], "source": [ @@ -421,7 +429,11 @@ { "cell_type": "code", "execution_count": null, +<<<<<<< HEAD "id": "180a870b", +======= + "id": "e27de158", +>>>>>>> main "metadata": {}, "outputs": [], "source": [ diff --git a/synced_files/GA_1_7/Student/Emissions/Analysis_emissions.ipynb b/synced_files/GA_1_7/Student/Emissions/Analysis_emissions.ipynb index 60941446b0898f166335a81584ecf39c5b39e952..131ebe4a4fccb1f7136a33f13f1ddc2c929d6cd6 100644 --- a/synced_files/GA_1_7/Student/Emissions/Analysis_emissions.ipynb +++ b/synced_files/GA_1_7/Student/Emissions/Analysis_emissions.ipynb @@ -378,7 +378,11 @@ }, { "cell_type": "markdown", +<<<<<<< HEAD "id": "f9dcaf93", +======= + "id": "ed98b341", +>>>>>>> main "metadata": {}, "source": [ "If you run the code in the cell below, you will obtain a scatter plot of both variables. Explore the relationship between both variables and answer the following questions:\n", @@ -399,7 +403,11 @@ { "cell_type": "code", "execution_count": null, +<<<<<<< HEAD "id": "d7955777", +======= + "id": "2cb19b34", +>>>>>>> main "metadata": {}, "outputs": [], "source": [ @@ -415,7 +423,11 @@ { "cell_type": "code", "execution_count": null, +<<<<<<< HEAD "id": "b46b07f7", +======= + "id": "667629ef", +>>>>>>> main "metadata": {}, "outputs": [], "source": [ diff --git a/synced_files/GA_1_7/Student/Force/Analysis_force.ipynb b/synced_files/GA_1_7/Student/Force/Analysis_force.ipynb index 5cf6f6c5f6b0dc522548e32c80d2b3cd9be7d240..c4b79e2696c9985a5dee3c57320fd50572b53a02 100644 --- a/synced_files/GA_1_7/Student/Force/Analysis_force.ipynb +++ b/synced_files/GA_1_7/Student/Force/Analysis_force.ipynb @@ -384,7 +384,11 @@ }, { "cell_type": "markdown", +<<<<<<< HEAD "id": "e11e7825", +======= + "id": "8f144eac", +>>>>>>> main "metadata": {}, "source": [ "If you run the code in the cell below, you will obtain a scatter plot of both variables. Explore the relationship between both variables and answer the following questions:\n", @@ -405,7 +409,11 @@ { "cell_type": "code", "execution_count": null, +<<<<<<< HEAD "id": "4e947832", +======= + "id": "14d4f318", +>>>>>>> main "metadata": {}, "outputs": [], "source": [ @@ -421,7 +429,11 @@ { "cell_type": "code", "execution_count": null, +<<<<<<< HEAD "id": "f2a17474", +======= + "id": "558ec231", +>>>>>>> main "metadata": {}, "outputs": [], "source": [ diff --git a/synced_files/GA_1_7/Unused/Temp/Distribution_Fitting_T.ipynb b/synced_files/GA_1_7/Unused/Temp/Distribution_Fitting_T.ipynb index ba172103edc26454f0b61bc9c8157bec3b16af39..20162e4615161961a6c8632291d00bd3b3279d0f 100644 --- a/synced_files/GA_1_7/Unused/Temp/Distribution_Fitting_T.ipynb +++ b/synced_files/GA_1_7/Unused/Temp/Distribution_Fitting_T.ipynb @@ -163,7 +163,11 @@ }, { "cell_type": "markdown", +<<<<<<< HEAD "id": "081f1ec5", +======= + "id": "9238bce1", +>>>>>>> main "metadata": {}, "source": [ "<div style=\"background-color:#FAE99E; color: black; vertical-align: middle; padding:15px; margin: 10px; border-radius: 10px\">\n", @@ -263,7 +267,11 @@ }, { "cell_type": "markdown", +<<<<<<< HEAD "id": "7df62f32", +======= + "id": "c0a31115", +>>>>>>> main "metadata": {}, "source": [ "<div style=\"background-color:#FAE99E; color: black; vertical-align: middle; padding:15px; margin: 10px; border-radius: 10px\">\n", @@ -372,7 +380,11 @@ { "cell_type": "code", "execution_count": null, +<<<<<<< HEAD "id": "2df07a2d", +======= + "id": "ae32cdb1", +>>>>>>> main "metadata": {}, "outputs": [], "source": [ @@ -434,7 +446,11 @@ }, { "cell_type": "markdown", +<<<<<<< HEAD "id": "2bbfe1d6", +======= + "id": "8058b11f", +>>>>>>> main "metadata": {}, "source": [ "<div style=\"background-color:#FAE99E; color: black; vertical-align: middle; padding:15px; margin: 10px; border-radius: 10px\">\n", @@ -533,7 +549,11 @@ }, { "cell_type": "markdown", +<<<<<<< HEAD "id": "582ec01b", +======= + "id": "69f35c60", +>>>>>>> main "metadata": {}, "source": [ "<div style=\"background-color:#FAE99E; color: black; vertical-align: middle; padding:15px; margin: 10px; border-radius: 10px\">\n", @@ -546,7 +566,11 @@ }, { "cell_type": "markdown", +<<<<<<< HEAD "id": "fe4678ef", +======= + "id": "680b68fb", +>>>>>>> main "metadata": {}, "source": [ "If you run the code in the cell below, you will obtain a scatter plot of both variables. Explore the relationship between both variables and answer the following questions:\n", @@ -567,7 +591,11 @@ { "cell_type": "code", "execution_count": null, +<<<<<<< HEAD "id": "09ac778e", +======= + "id": "c180ecec", +>>>>>>> main "metadata": {}, "outputs": [], "source": [ diff --git a/synced_files/Week_2_2/old/PA_2_1_solution_sympy.ipynb b/synced_files/Week_2_2/old/PA_2_1_solution_sympy.ipynb index 47d38f193d41731dfa57d9ec6c56346a21bcb5c5..827c7f7eb6551d7f571d9dc6dc6fb36527026978 100644 --- a/synced_files/Week_2_2/old/PA_2_1_solution_sympy.ipynb +++ b/synced_files/Week_2_2/old/PA_2_1_solution_sympy.ipynb @@ -404,7 +404,11 @@ }, { "cell_type": "markdown", +<<<<<<< HEAD "id": "9f36751a", +======= + "id": "36d9a7c0", +>>>>>>> main "metadata": {}, "source": [ "You could also solve this problem using sympy! What would be the benefit of doing this? Check below how long it will take! You won't need timeit for this one..." @@ -413,7 +417,11 @@ { "cell_type": "code", "execution_count": null, +<<<<<<< HEAD "id": "78cdc7d0", +======= + "id": "6f97db4f", +>>>>>>> main "metadata": {}, "outputs": [], "source": [ @@ -423,7 +431,11 @@ { "cell_type": "code", "execution_count": null, +<<<<<<< HEAD "id": "4bbc65e1", +======= + "id": "bafb34c9", +>>>>>>> main "metadata": {}, "outputs": [], "source": [ @@ -433,7 +445,11 @@ { "cell_type": "code", "execution_count": null, +<<<<<<< HEAD "id": "5d47db08", +======= + "id": "5acc936b", +>>>>>>> main "metadata": {}, "outputs": [], "source": [ @@ -445,7 +461,11 @@ { "cell_type": "code", "execution_count": null, +<<<<<<< HEAD "id": "9f352498", +======= + "id": "35fa2b0a", +>>>>>>> main "metadata": {}, "outputs": [], "source": [ @@ -456,7 +476,11 @@ { "cell_type": "code", "execution_count": null, +<<<<<<< HEAD "id": "a851b451", +======= + "id": "ba7311c0", +>>>>>>> main "metadata": {}, "outputs": [], "source": [ @@ -465,7 +489,11 @@ }, { "cell_type": "markdown", +<<<<<<< HEAD "id": "5bef59dd", +======= + "id": "fa2b7d01", +>>>>>>> main "metadata": {}, "source": [ "What is the result for the 501th value using float values?" @@ -474,7 +502,11 @@ { "cell_type": "code", "execution_count": null, +<<<<<<< HEAD "id": "6efce66e", +======= + "id": "35928bf5", +>>>>>>> main "metadata": {}, "outputs": [], "source": [ @@ -514,7 +546,11 @@ }, { "cell_type": "markdown", +<<<<<<< HEAD "id": "fadd8f6f", +======= + "id": "c1477779", +>>>>>>> main "metadata": {}, "source": [] } diff --git a/synced_files/Week_2_2/old/old_PA10_solution_sympy.ipynb b/synced_files/Week_2_2/old/old_PA10_solution_sympy.ipynb index 0b1a64da66093fa391421266375dbc7f1b6a27df..4858f5b03e28bd37198d424f6d4e337ff8dee0bb 100644 --- a/synced_files/Week_2_2/old/old_PA10_solution_sympy.ipynb +++ b/synced_files/Week_2_2/old/old_PA10_solution_sympy.ipynb @@ -404,7 +404,11 @@ }, { "cell_type": "markdown", +<<<<<<< HEAD "id": "8a7dd876", +======= + "id": "e716dc11", +>>>>>>> main "metadata": {}, "source": [ "You could also solve this problem using sympy! What would be the benefit of doing this? Check below how long it will take! You won't need timeit for this one..." @@ -413,7 +417,11 @@ { "cell_type": "code", "execution_count": null, +<<<<<<< HEAD "id": "104ba945", +======= + "id": "7c0d44d8", +>>>>>>> main "metadata": {}, "outputs": [], "source": [ @@ -423,7 +431,11 @@ { "cell_type": "code", "execution_count": null, +<<<<<<< HEAD "id": "cb3c5ef1", +======= + "id": "4c918e26", +>>>>>>> main "metadata": {}, "outputs": [], "source": [ @@ -433,7 +445,11 @@ { "cell_type": "code", "execution_count": null, +<<<<<<< HEAD "id": "2c8fc7e6", +======= + "id": "8c710380", +>>>>>>> main "metadata": {}, "outputs": [], "source": [ @@ -445,7 +461,11 @@ { "cell_type": "code", "execution_count": null, +<<<<<<< HEAD "id": "899f67ba", +======= + "id": "bc2acf6a", +>>>>>>> main "metadata": {}, "outputs": [], "source": [ @@ -456,7 +476,11 @@ { "cell_type": "code", "execution_count": null, +<<<<<<< HEAD "id": "4a340715", +======= + "id": "6e7eae04", +>>>>>>> main "metadata": {}, "outputs": [], "source": [ @@ -465,7 +489,11 @@ }, { "cell_type": "markdown", +<<<<<<< HEAD "id": "a1153cf8", +======= + "id": "159a38dd", +>>>>>>> main "metadata": {}, "source": [ "What is the result for the 501th value using float values?" @@ -474,7 +502,11 @@ { "cell_type": "code", "execution_count": null, +<<<<<<< HEAD "id": "b731ff67", +======= + "id": "66870129", +>>>>>>> main "metadata": {}, "outputs": [], "source": [ @@ -514,7 +546,11 @@ }, { "cell_type": "markdown", +<<<<<<< HEAD "id": "514a9db8", +======= + "id": "78140798", +>>>>>>> main "metadata": {}, "source": [] }