Merge branch 'main' into release

10c922d0 · Robert Lanzafame · 3c769dc8 · f5b399c1 · 10c922d0 · 10c922d0
Commit 10c922d0 authored 3 months ago by Robert Lanzafame
--- 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",

--- 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",

--- 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",

--- 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": [

--- 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": [

--- 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": [

--- 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": [

--- 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": []
  }

--- 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": []
  }