diff --git a/1.-Python/1.-Snail-and-Well/.ipynb_checkpoints/snail-and-well-checkpoint.ipynb b/1.-Python/1.-Snail-and-Well/.ipynb_checkpoints/snail-and-well-checkpoint.ipynb new file mode 100644 index 000000000..a938c812a --- /dev/null +++ b/1.-Python/1.-Snail-and-Well/.ipynb_checkpoints/snail-and-well-checkpoint.ipynb @@ -0,0 +1,291 @@ +{ + "cells": [ + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "# The Snail and the Well\n", + "\n", + "A snail falls at the bottom of a 125 cm well. Each day the snail rises 30 cm. But at night, while sleeping, slides 20 cm because the walls are wet. How many days does it take for the snail to escape the well?\n", + "\n", + "**Hint**: The snail gets out of the well when it surpasses the 125cm of height.\n", + "\n", + "## Tools\n", + "\n", + "1. Loop: **while**\n", + "2. Conditional statements: **if-else**\n", + "3. Function: **print()**\n", + "\n", + "## Tasks\n", + "\n", + "#### 1. Assign the challenge data to variables with representative names: `well_height`, `daily_distance`, `nightly_distance` and `snail_position`." + ] + }, + { + "cell_type": "code", + "execution_count": 1, + "metadata": {}, + "outputs": [], + "source": [ + "well_height = 125\n", + "daily_distance = 30\n", + "nightly_distance = 20\n", + "snail_position = 0" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 2. Create a variable `days` to keep count of the days that pass until the snail escapes the well. " + ] + }, + { + "cell_type": "code", + "execution_count": 2, + "metadata": {}, + "outputs": [], + "source": [ + "days =0" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 3. Find the solution to the challenge using the variables defined above. " + ] + }, + { + "cell_type": "code", + "execution_count": 3, + "metadata": {}, + "outputs": [], + "source": [ + "while snail_position <= well_height:\n", + " snail_position += daily_distance\n", + " days +=1\n", + " if snail_position > well_height:\n", + " break\n", + " else:\n", + " snail_position-=nightly_distance\n", + " " + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 4. Print the solution." + ] + }, + { + "cell_type": "code", + "execution_count": 4, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The daily advance in cm was: 130, It takes time to get out of the well: 11 \n" + ] + } + ], + "source": [ + "print(\"The daily advance in cm was: {}, It takes time to get out of the well: {} \" .format(snail_position, days))" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## Bonus\n", + "The distance traveled by the snail each day is now defined by a list.\n", + "```\n", + "advance_cm = [30, 21, 33, 77, 44, 45, 23, 45, 12, 34, 55]\n", + "```\n", + "On the first day, the snail rises 30cm but during the night it slides 20cm. On the second day, the snail rises 21cm but during the night it slides 20cm, and so on. \n", + "\n", + "#### 1. How many days does it take for the snail to escape the well?\n", + "Follow the same guidelines as in the previous challenge.\n", + "\n", + "**Hint**: Remember that the snail gets out of the well when it surpasses the 125cm of height." + ] + }, + { + "cell_type": "code", + "execution_count": 8, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The days it took to get out of the well: 6\n" + ] + } + ], + "source": [ + "well_height = 125\n", + "nightly_distance = 20\n", + "advance_cm = [30, 21, 33, 77, 44, 45, 23, 45, 12, 34, 55]\n", + "snail_position = 0\n", + "days = 0\n", + "\n", + "while snail_position <= well_height:\n", + " \n", + " daily_distance = advance_cm[days]\n", + " snail_position += daily_distance\n", + " days += 1\n", + " if snail_position > well_height:\n", + " break\n", + " else:\n", + " snail_position -= nightly_distance\n", + "\n", + "\n", + "print(\"The days it took to get out of the well: \" , days)\n" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 2. What is its maximum displacement in one day? And its minimum? Calculate the displacement using only the travel distance of the days used to get out of the well. \n", + "**Hint**: Remember that displacement means the total distance risen taking into account that the snail slides at night. " + ] + }, + { + "cell_type": "code", + "execution_count": 9, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "[10, 1, 13, 57, 24, 45]\n", + "The minimum displacement was: 1\n", + "The maximum displacement was: 57\n" + ] + } + ], + "source": [ + "displacement_day_night = []\n", + "\n", + "for i in advance_cm[:days]:\n", + " displacement_day_night.append(i-nightly_distance)\n", + " \n", + "displacement_day_night[5] = advance_cm[5]\n", + "\n", + "print(displacement_day_night)\n", + " \n", + "\n", + "print(\"The minimum displacement was: \", min(displacement_day_night))\n", + "print(\"The maximum displacement was: \" , max(displacement_day_night))\n" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 3. What is its average progress? Take into account the snail slides at night." + ] + }, + { + "cell_type": "code", + "execution_count": 10, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "25.0\n" + ] + } + ], + "source": [ + "average_progress = sum(displacement_day_night) /len(displacement_day_night)\n", + "print(average_progress)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 4. What is the standard deviation of its displacement? Take into account the snail slides at night." + ] + }, + { + "cell_type": "code", + "execution_count": 15, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The standard deviation is: 21.77\n", + "The standard deviation is: 19.87\n" + ] + } + ], + "source": [ + "import statistics\n", + "import math\n", + "\n", + "#Sample standard deviation\n", + "\n", + "desv= round(statistics.stdev(displacement_day_night),2)\n", + "print(\"The sample standard deviation is: \", desv)\n", + "\n", + "\n", + "#Population standard deviation\n", + "\n", + "list = []\n", + "for i in displacement_day_night:\n", + " list.append((i-average_progress)**2)\n", + " \n", + "addition = sum(list)\n", + "deviation = round(math.sqrt(addition/len(displacement_day_night)),2)\n", + "print(\"The population standard deviation is: \", deviation)" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [] + } + ], + "metadata": { + "kernelspec": { + "display_name": "Python 3 (ipykernel)", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.9.6" + } + }, + "nbformat": 4, + "nbformat_minor": 2 +} diff --git a/1.-Python/1.-Snail-and-Well/snail-and-well.ipynb b/1.-Python/1.-Snail-and-Well/snail-and-well.ipynb index 34021448a..a938c812a 100644 --- a/1.-Python/1.-Snail-and-Well/snail-and-well.ipynb +++ b/1.-Python/1.-Snail-and-Well/snail-and-well.ipynb @@ -30,10 +30,15 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 1, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "well_height = 125\n", + "daily_distance = 30\n", + "nightly_distance = 20\n", + "snail_position = 0" + ] }, { "cell_type": "markdown", @@ -44,10 +49,12 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 2, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "days =0" + ] }, { "cell_type": "markdown", @@ -58,10 +65,19 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 3, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "while snail_position <= well_height:\n", + " snail_position += daily_distance\n", + " days +=1\n", + " if snail_position > well_height:\n", + " break\n", + " else:\n", + " snail_position-=nightly_distance\n", + " " + ] }, { "cell_type": "markdown", @@ -72,10 +88,20 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 4, "metadata": {}, - "outputs": [], - "source": [] + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The daily advance in cm was: 130, It takes time to get out of the well: 11 \n" + ] + } + ], + "source": [ + "print(\"The daily advance in cm was: {}, It takes time to get out of the well: {} \" .format(snail_position, days))" + ] }, { "cell_type": "markdown", @@ -96,10 +122,37 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 8, "metadata": {}, - "outputs": [], - "source": [] + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The days it took to get out of the well: 6\n" + ] + } + ], + "source": [ + "well_height = 125\n", + "nightly_distance = 20\n", + "advance_cm = [30, 21, 33, 77, 44, 45, 23, 45, 12, 34, 55]\n", + "snail_position = 0\n", + "days = 0\n", + "\n", + "while snail_position <= well_height:\n", + " \n", + " daily_distance = advance_cm[days]\n", + " snail_position += daily_distance\n", + " days += 1\n", + " if snail_position > well_height:\n", + " break\n", + " else:\n", + " snail_position -= nightly_distance\n", + "\n", + "\n", + "print(\"The days it took to get out of the well: \" , days)\n" + ] }, { "cell_type": "markdown", @@ -111,10 +164,33 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 9, "metadata": {}, - "outputs": [], - "source": [] + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "[10, 1, 13, 57, 24, 45]\n", + "The minimum displacement was: 1\n", + "The maximum displacement was: 57\n" + ] + } + ], + "source": [ + "displacement_day_night = []\n", + "\n", + "for i in advance_cm[:days]:\n", + " displacement_day_night.append(i-nightly_distance)\n", + " \n", + "displacement_day_night[5] = advance_cm[5]\n", + "\n", + "print(displacement_day_night)\n", + " \n", + "\n", + "print(\"The minimum displacement was: \", min(displacement_day_night))\n", + "print(\"The maximum displacement was: \" , max(displacement_day_night))\n" + ] }, { "cell_type": "markdown", @@ -125,10 +201,21 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 10, "metadata": {}, - "outputs": [], - "source": [] + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "25.0\n" + ] + } + ], + "source": [ + "average_progress = sum(displacement_day_night) /len(displacement_day_night)\n", + "print(average_progress)" + ] }, { "cell_type": "markdown", @@ -137,6 +224,41 @@ "#### 4. What is the standard deviation of its displacement? Take into account the snail slides at night." ] }, + { + "cell_type": "code", + "execution_count": 15, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The standard deviation is: 21.77\n", + "The standard deviation is: 19.87\n" + ] + } + ], + "source": [ + "import statistics\n", + "import math\n", + "\n", + "#Sample standard deviation\n", + "\n", + "desv= round(statistics.stdev(displacement_day_night),2)\n", + "print(\"The sample standard deviation is: \", desv)\n", + "\n", + "\n", + "#Population standard deviation\n", + "\n", + "list = []\n", + "for i in displacement_day_night:\n", + " list.append((i-average_progress)**2)\n", + " \n", + "addition = sum(list)\n", + "deviation = round(math.sqrt(addition/len(displacement_day_night)),2)\n", + "print(\"The population standard deviation is: \", deviation)" + ] + }, { "cell_type": "code", "execution_count": null, @@ -147,7 +269,7 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 3", + "display_name": "Python 3 (ipykernel)", "language": "python", "name": "python3" }, @@ -161,7 +283,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.7.2" + "version": "3.9.6" } }, "nbformat": 4, diff --git a/1.-Python/2.-Duel-of-Sorcerers/.ipynb_checkpoints/duel-of-sorcerers-checkpoint.ipynb b/1.-Python/2.-Duel-of-Sorcerers/.ipynb_checkpoints/duel-of-sorcerers-checkpoint.ipynb new file mode 100644 index 000000000..acc6fc58e --- /dev/null +++ b/1.-Python/2.-Duel-of-Sorcerers/.ipynb_checkpoints/duel-of-sorcerers-checkpoint.ipynb @@ -0,0 +1,380 @@ +{ + "cells": [ + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "# Duel of Sorcerers\n", + "You are witnessing an epic battle between two powerful sorcerers: Gandalf and Saruman. Each sorcerer has 10 spells of variable power in their mind and they are going to throw them one after the other. The winner of the duel will be the one who wins more of those clashes between spells. Spells are represented as a list of 10 integers whose value equals the power of the spell.\n", + "```\n", + "gandalf = [10, 11, 13, 30, 22, 11, 10, 33, 22, 22]\n", + "saruman = [23, 66, 12, 43, 12, 10, 44, 23, 12, 17]\n", + "```\n", + "For example:\n", + "- The first clash is won by Saruman: 10 against 23.\n", + "- The second clash is won by Saruman: 11 against 66.\n", + "- ...\n", + "\n", + "You will create two variables, one for each sorcerer, where the sum of clashes won will be stored. Depending on which variable is greater at the end of the duel, you will show one of the following three results on the screen:\n", + "* Gandalf wins\n", + "* Saruman wins\n", + "* Tie\n", + "\n", + "" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## Tools\n", + "You don't necessarily need to use all the tools. Maybe you opt to use some of them or completely different ones, they are given to help you shape the exercise. Programming exercises can be solved in many different ways.\n", + "\n", + "1. Data structures: **lists, dictionaries**\n", + "2. Loop: **for loop**\n", + "3. Conditional statements: **if-elif-else**\n", + "4. Functions: **range(), len(), print()**\n", + "\n", + "## Tasks\n", + "\n", + "#### 1. Create two variables called `gandalf` and `saruman` and assign them the spell power lists. Create a variable called `spells` to store the number of spells that the sorcerers cast. " + ] + }, + { + "cell_type": "code", + "execution_count": 1, + "metadata": {}, + "outputs": [], + "source": [ + "gandalf = [10, 11, 13, 30, 22, 11, 10, 33, 22, 22]\n", + "saruman = [23, 66, 12, 43, 12, 10, 44, 23, 12, 17]\n", + "spells = 0" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 2. Create two variables called `gandalf_wins` and `saruman_wins`. Set both of them to 0. \n", + "You will use these variables to count the number of clashes each sorcerer wins. " + ] + }, + { + "cell_type": "code", + "execution_count": 2, + "metadata": {}, + "outputs": [], + "source": [ + "gandalf_wins = 0\n", + "saruman_wins = 0" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 3. Using the lists of spells of both sorcerers, update variables `gandalf_wins` and `saruman_wins` to count the number of times each sorcerer wins a clash. " + ] + }, + { + "cell_type": "code", + "execution_count": 3, + "metadata": {}, + "outputs": [], + "source": [ + "tie =0\n", + "number = len(gandalf)\n", + "\n", + "while spells < number:\n", + " if gandalf[spells] > saruman[spells]:\n", + " gandalf_wins +=1\n", + " elif gandalf[spells] < saruman[spells]:\n", + " saruman_wins += 1\n", + " else:\n", + " tie +=1\n", + " spells += 1" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 4. Who won the battle?\n", + "Print `Gandalf wins`, `Saruman wins` or `Tie` depending on the result. " + ] + }, + { + "cell_type": "code", + "execution_count": 4, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The winner was gandalf with: 6\n" + ] + } + ], + "source": [ + "if gandalf_wins > saruman_wins:\n", + " print(\"The winner was gandalf with: \", gandalf_wins)\n", + "elif saruman_wins > gandalf_wins:\n", + " print(\"The winner was saruman with: \", saruman_wins)\n", + "else:\n", + " print(\"There was a tie: \", tie) \n" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## Bonus\n", + "\n", + "In this bonus challenge, you'll need to check the winner of the battle but this time, a sorcerer wins if he succeeds in winning 3 spell clashes in a row.\n", + "\n", + "Also, the spells now have a name and there is a dictionary that associates that name to a power.\n", + "\n", + "```\n", + "POWER = {\n", + " 'Fireball': 50, \n", + " 'Lightning bolt': 40, \n", + " 'Magic arrow': 10, \n", + " 'Black Tentacles': 25, \n", + " 'Contagion': 45\n", + "}\n", + "\n", + "gandalf = ['Fireball', 'Lightning bolt', 'Lightning bolt', 'Magic arrow', 'Fireball', \n", + " 'Magic arrow', 'Lightning bolt', 'Fireball', 'Fireball', 'Fireball']\n", + "saruman = ['Contagion', 'Contagion', 'Black Tentacles', 'Fireball', 'Black Tentacles', \n", + " 'Lightning bolt', 'Magic arrow', 'Contagion', 'Magic arrow', 'Magic arrow']\n", + "```\n", + "\n", + "#### 1. Create variables `POWER`, `gandalf` and `saruman` as seen above. Create a variable called `spells` to store the number of spells that the sorcerers cast. " + ] + }, + { + "cell_type": "code", + "execution_count": 5, + "metadata": {}, + "outputs": [], + "source": [ + "POWER = {\n", + " 'Fireball': 50, \n", + " 'Lightning bolt': 40, \n", + " 'Magic arrow': 10, \n", + " 'Black Tentacles': 25, \n", + " 'Contagion': 45\n", + "}\n", + "\n", + "gandalf = ['Fireball', 'Lightning bolt', 'Lightning bolt', 'Magic arrow', 'Fireball', \n", + " 'Magic arrow', 'Lightning bolt', 'Fireball', 'Fireball', 'Fireball']\n", + "\n", + "saruman = ['Contagion', 'Contagion', 'Black Tentacles', 'Fireball', 'Black Tentacles', \n", + " 'Lightning bolt', 'Magic arrow', 'Contagion', 'Magic arrow', 'Magic arrow']\n", + "\n", + "spells = 0" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 2. Create two variables called `gandalf_wins` and `saruman_wins`. Set both of them to 0. " + ] + }, + { + "cell_type": "code", + "execution_count": 6, + "metadata": {}, + "outputs": [], + "source": [ + "gandalf_wins = 0\n", + "saruman_wins = 0" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 3. Create two variables called `gandalf_power` and `saruman_power` to store the list of spell powers of each sorcerer." + ] + }, + { + "cell_type": "code", + "execution_count": 7, + "metadata": {}, + "outputs": [], + "source": [ + "gandalf_power = []\n", + "saruman_power = []" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 4. The battle starts! Using the variables you've created above, code the execution of spell clashes. Remember that a sorcerer wins if he succeeds in winning 3 spell clashes in a row. \n", + "If a clash ends up in a tie, the counter of wins in a row is not restarted to 0. Remember to print who is the winner of the battle. " + ] + }, + { + "cell_type": "code", + "execution_count": 8, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The winner was gandalf with: 4\n" + ] + } + ], + "source": [ + "rank = len(gandalf)\n", + "\n", + "while spells < rank:\n", + " gandalf_power.append(POWER.get(gandalf[spells]))\n", + " saruman_power.append(POWER.get(saruman[spells]))\n", + " spells +=1\n", + "\n", + "\n", + "spells = 0\n", + "while spells < rank:\n", + " if gandalf_power[spells] > saruman_power[spells]:\n", + " gandalf_wins +=1\n", + " saruman_wins = 0\n", + " elif gandalf_power[spells] < saruman_power[spells]:\n", + " saruman_wins +=1\n", + " gandalf_wins = 0\n", + " elif gandalf_wins == 3:\n", + " break\n", + " elif saruman_wins == 3:\n", + " break\n", + " elif gandalf_power[spells] == saruman_power[spells]:\n", + " tie +=1\n", + " spells += 1\n", + "\n", + " \n", + "if gandalf_wins > saruman_wins:\n", + " print(\"The winner was gandalf with: \", gandalf_wins)\n", + "elif saruman_wins > gandalf_wins:\n", + " print(\"The winner was saruman with: \", saruman_wins)\n", + "else:\n", + " print(\"There was a tie: \", tie) \n" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 5. Find the average spell power of Gandalf and Saruman. " + ] + }, + { + "cell_type": "code", + "execution_count": 9, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Gandalf's average power is: 39.0\n", + "Saruman's average power is: 30.5\n" + ] + } + ], + "source": [ + "average_gandalf_power = (sum(gandalf_power) / len(gandalf_power))\n", + "average_saruman_power = (sum(saruman_power) / len(saruman_power))\n", + "\n", + "print(\"Gandalf's average power is: \", average_gandalf_power)\n", + "print(\"Saruman's average power is: \", average_saruman_power)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 6. Find the standard deviation of the spell power of Gandalf and Saruman. " + ] + }, + { + "cell_type": "code", + "execution_count": 13, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The standard deviation of Gandalf's power is: 15.13\n", + "The standard deviation of the Saruman power is: 15.56\n" + ] + } + ], + "source": [ + "#Standard Deviation\n", + "\n", + "import math\n", + "\n", + "\n", + "des_galdalf_power = []\n", + "for i in gandalf_power:\n", + " des_galdalf_power.append((i-average_gandalf_power)**2)\n", + " \n", + "addition = sum(des_galdalf_power)\n", + "deviation_galdalf_power = round(math.sqrt(addition/len(des_galdalf_power)),2)\n", + "\n", + "print(\"The standard deviation of Gandalf's power is: \", deviation_galdalf_power) \n", + "\n", + "\n", + "des_saruman_power = []\n", + "for i in saruman_power:\n", + " des_saruman_power.append((i-average_saruman_power)**2)\n", + " \n", + "addition = sum(des_saruman_power)\n", + "deviation_saruman_power = round(math.sqrt(addition/len(des_saruman_power)),2)\n", + "\n", + "print(\"The standard deviation of the Saruman power is: \", deviation_saruman_power)" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [] + } + ], + "metadata": { + "kernelspec": { + "display_name": "Python 3 (ipykernel)", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.9.6" + } + }, + "nbformat": 4, + "nbformat_minor": 2 +} diff --git a/1.-Python/2.-Duel-of-Sorcerers/duel-of-sorcerers.ipynb b/1.-Python/2.-Duel-of-Sorcerers/duel-of-sorcerers.ipynb index b4a5f6d7e..acc6fc58e 100644 --- a/1.-Python/2.-Duel-of-Sorcerers/duel-of-sorcerers.ipynb +++ b/1.-Python/2.-Duel-of-Sorcerers/duel-of-sorcerers.ipynb @@ -49,10 +49,14 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 1, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "gandalf = [10, 11, 13, 30, 22, 11, 10, 33, 22, 22]\n", + "saruman = [23, 66, 12, 43, 12, 10, 44, 23, 12, 17]\n", + "spells = 0" + ] }, { "cell_type": "markdown", @@ -64,10 +68,13 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 2, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "gandalf_wins = 0\n", + "saruman_wins = 0" + ] }, { "cell_type": "markdown", @@ -78,10 +85,22 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 3, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "tie =0\n", + "number = len(gandalf)\n", + "\n", + "while spells < number:\n", + " if gandalf[spells] > saruman[spells]:\n", + " gandalf_wins +=1\n", + " elif gandalf[spells] < saruman[spells]:\n", + " saruman_wins += 1\n", + " else:\n", + " tie +=1\n", + " spells += 1" + ] }, { "cell_type": "markdown", @@ -93,10 +112,25 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 4, "metadata": {}, - "outputs": [], - "source": [] + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The winner was gandalf with: 6\n" + ] + } + ], + "source": [ + "if gandalf_wins > saruman_wins:\n", + " print(\"The winner was gandalf with: \", gandalf_wins)\n", + "elif saruman_wins > gandalf_wins:\n", + " print(\"The winner was saruman with: \", saruman_wins)\n", + "else:\n", + " print(\"There was a tie: \", tie) \n" + ] }, { "cell_type": "markdown", @@ -128,10 +162,26 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 5, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "POWER = {\n", + " 'Fireball': 50, \n", + " 'Lightning bolt': 40, \n", + " 'Magic arrow': 10, \n", + " 'Black Tentacles': 25, \n", + " 'Contagion': 45\n", + "}\n", + "\n", + "gandalf = ['Fireball', 'Lightning bolt', 'Lightning bolt', 'Magic arrow', 'Fireball', \n", + " 'Magic arrow', 'Lightning bolt', 'Fireball', 'Fireball', 'Fireball']\n", + "\n", + "saruman = ['Contagion', 'Contagion', 'Black Tentacles', 'Fireball', 'Black Tentacles', \n", + " 'Lightning bolt', 'Magic arrow', 'Contagion', 'Magic arrow', 'Magic arrow']\n", + "\n", + "spells = 0" + ] }, { "cell_type": "markdown", @@ -142,10 +192,13 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 6, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "gandalf_wins = 0\n", + "saruman_wins = 0" + ] }, { "cell_type": "markdown", @@ -156,10 +209,13 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 7, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "gandalf_power = []\n", + "saruman_power = []" + ] }, { "cell_type": "markdown", @@ -171,10 +227,50 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 8, "metadata": {}, - "outputs": [], - "source": [] + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The winner was gandalf with: 4\n" + ] + } + ], + "source": [ + "rank = len(gandalf)\n", + "\n", + "while spells < rank:\n", + " gandalf_power.append(POWER.get(gandalf[spells]))\n", + " saruman_power.append(POWER.get(saruman[spells]))\n", + " spells +=1\n", + "\n", + "\n", + "spells = 0\n", + "while spells < rank:\n", + " if gandalf_power[spells] > saruman_power[spells]:\n", + " gandalf_wins +=1\n", + " saruman_wins = 0\n", + " elif gandalf_power[spells] < saruman_power[spells]:\n", + " saruman_wins +=1\n", + " gandalf_wins = 0\n", + " elif gandalf_wins == 3:\n", + " break\n", + " elif saruman_wins == 3:\n", + " break\n", + " elif gandalf_power[spells] == saruman_power[spells]:\n", + " tie +=1\n", + " spells += 1\n", + "\n", + " \n", + "if gandalf_wins > saruman_wins:\n", + " print(\"The winner was gandalf with: \", gandalf_wins)\n", + "elif saruman_wins > gandalf_wins:\n", + " print(\"The winner was saruman with: \", saruman_wins)\n", + "else:\n", + " print(\"There was a tie: \", tie) \n" + ] }, { "cell_type": "markdown", @@ -185,10 +281,25 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 9, "metadata": {}, - "outputs": [], - "source": [] + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Gandalf's average power is: 39.0\n", + "Saruman's average power is: 30.5\n" + ] + } + ], + "source": [ + "average_gandalf_power = (sum(gandalf_power) / len(gandalf_power))\n", + "average_saruman_power = (sum(saruman_power) / len(saruman_power))\n", + "\n", + "print(\"Gandalf's average power is: \", average_gandalf_power)\n", + "print(\"Saruman's average power is: \", average_saruman_power)" + ] }, { "cell_type": "markdown", @@ -197,6 +308,46 @@ "#### 6. Find the standard deviation of the spell power of Gandalf and Saruman. " ] }, + { + "cell_type": "code", + "execution_count": 13, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The standard deviation of Gandalf's power is: 15.13\n", + "The standard deviation of the Saruman power is: 15.56\n" + ] + } + ], + "source": [ + "#Standard Deviation\n", + "\n", + "import math\n", + "\n", + "\n", + "des_galdalf_power = []\n", + "for i in gandalf_power:\n", + " des_galdalf_power.append((i-average_gandalf_power)**2)\n", + " \n", + "addition = sum(des_galdalf_power)\n", + "deviation_galdalf_power = round(math.sqrt(addition/len(des_galdalf_power)),2)\n", + "\n", + "print(\"The standard deviation of Gandalf's power is: \", deviation_galdalf_power) \n", + "\n", + "\n", + "des_saruman_power = []\n", + "for i in saruman_power:\n", + " des_saruman_power.append((i-average_saruman_power)**2)\n", + " \n", + "addition = sum(des_saruman_power)\n", + "deviation_saruman_power = round(math.sqrt(addition/len(des_saruman_power)),2)\n", + "\n", + "print(\"The standard deviation of the Saruman power is: \", deviation_saruman_power)" + ] + }, { "cell_type": "code", "execution_count": null, @@ -207,7 +358,7 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 3", + "display_name": "Python 3 (ipykernel)", "language": "python", "name": "python3" }, @@ -221,7 +372,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.7.2" + "version": "3.9.6" } }, "nbformat": 4, diff --git a/1.-Python/3.-Bus/.ipynb_checkpoints/bus-checkpoint.ipynb b/1.-Python/3.-Bus/.ipynb_checkpoints/bus-checkpoint.ipynb new file mode 100644 index 000000000..9b842cd08 --- /dev/null +++ b/1.-Python/3.-Bus/.ipynb_checkpoints/bus-checkpoint.ipynb @@ -0,0 +1,187 @@ +{ + "cells": [ + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "# Bus\n", + "\n", + "This bus has a passenger entry and exit control system to monitor the number of occupants it carries and thus detect when there are too many.\n", + "\n", + "At each stop, the entry and exit of passengers is represented by a tuple consisting of two integer numbers.\n", + "```\n", + "bus_stop = (in, out)\n", + "```\n", + "The succession of stops is represented by a list of these tuples.\n", + "```\n", + "stops = [(in1, out1), (in2, out2), (in3, out3), (in4, out4)]\n", + "```\n", + "\n", + "## Tools\n", + "You don't necessarily need to use all the tools. Maybe you opt to use some of them or completely different ones, they are given to help you shape the exercise. Programming exercises can be solved in many different ways.\n", + "* Data structures: **lists, tuples**\n", + "* Loop: **while/for loops**\n", + "* Functions: **min, max, len**\n", + "\n", + "## Tasks" + ] + }, + { + "cell_type": "code", + "execution_count": 1, + "metadata": {}, + "outputs": [], + "source": [ + "# Variables\n", + "stops = [(10, 0), (4, 1), (3, 5), (3, 4), (5, 1), (1, 5), (5, 8), (4, 6), (2, 3)]\n", + "number_of_passengers = []\n", + "previous_entry = 0\n", + "number_of_stops=0\n", + "maximum_occupancy=0\n", + "average_occupation=0\n", + "bus_dev=0" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 1. Calculate the number of stops." + ] + }, + { + "cell_type": "code", + "execution_count": 2, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "the number of stops is: 9\n" + ] + } + ], + "source": [ + "number_of_stops=len(stops)\n", + "\n", + "print(\"the number of stops is: \", number_of_stops)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 2. Assign to a variable a list whose elements are the number of passengers at each stop (in-out).\n", + "Each item depends on the previous item in the list + in - out." + ] + }, + { + "cell_type": "code", + "execution_count": 3, + "metadata": {}, + "outputs": [], + "source": [ + "for ing , out in stops:\n", + " number_of_passengers.append( previous_entry + ing - out)\n", + " previous_entry = previous_entry + ing - out" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 3. Find the maximum occupation of the bus." + ] + }, + { + "cell_type": "code", + "execution_count": 4, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The maximum occupation of the bus is: 14\n" + ] + } + ], + "source": [ + "maximum_occupancy=max(number_of_passengers)\n", + "print(\"The maximum occupation of the bus is: \", maximum_occupancy)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 4. Calculate the average occupation. And the standard deviation." + ] + }, + { + "cell_type": "code", + "execution_count": 6, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The average occupation of the bus is: 9\n", + "The standard deviation is: 3.39\n" + ] + } + ], + "source": [ + "import statistics\n", + "\n", + "#Average occupation:\n", + "\n", + "average_occupation=round(sum(number_of_passengers)/len(stops))\n", + "print(\"The average occupation of the bus is: \", average_occupation)\n", + "\n", + "\n", + "#Standard Deviation:\n", + "\n", + "bus_dev=round(statistics.stdev(number_of_passengers),2)\n", + "print(\"The standard deviation is: \", bus_dev)" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [] + } + ], + "metadata": { + "kernelspec": { + "display_name": "Python 3 (ipykernel)", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.9.6" + } + }, + "nbformat": 4, + "nbformat_minor": 2 +} diff --git a/1.-Python/3.-Bus/bus.ipynb b/1.-Python/3.-Bus/bus.ipynb index 31f09b8fd..9b842cd08 100644 --- a/1.-Python/3.-Bus/bus.ipynb +++ b/1.-Python/3.-Bus/bus.ipynb @@ -35,12 +35,18 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 1, "metadata": {}, "outputs": [], "source": [ "# Variables\n", - "stops = [(10, 0), (4, 1), (3, 5), (3, 4), (5, 1), (1, 5), (5, 8), (4, 6), (2, 3)]" + "stops = [(10, 0), (4, 1), (3, 5), (3, 4), (5, 1), (1, 5), (5, 8), (4, 6), (2, 3)]\n", + "number_of_passengers = []\n", + "previous_entry = 0\n", + "number_of_stops=0\n", + "maximum_occupancy=0\n", + "average_occupation=0\n", + "bus_dev=0" ] }, { @@ -52,10 +58,22 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 2, "metadata": {}, - "outputs": [], - "source": [] + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "the number of stops is: 9\n" + ] + } + ], + "source": [ + "number_of_stops=len(stops)\n", + "\n", + "print(\"the number of stops is: \", number_of_stops)" + ] }, { "cell_type": "markdown", @@ -67,10 +85,14 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 3, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "for ing , out in stops:\n", + " number_of_passengers.append( previous_entry + ing - out)\n", + " previous_entry = previous_entry + ing - out" + ] }, { "cell_type": "markdown", @@ -81,10 +103,21 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 4, "metadata": {}, - "outputs": [], - "source": [] + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The maximum occupation of the bus is: 14\n" + ] + } + ], + "source": [ + "maximum_occupancy=max(number_of_passengers)\n", + "print(\"The maximum occupation of the bus is: \", maximum_occupancy)" + ] }, { "cell_type": "markdown", @@ -93,6 +126,35 @@ "#### 4. Calculate the average occupation. And the standard deviation." ] }, + { + "cell_type": "code", + "execution_count": 6, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The average occupation of the bus is: 9\n", + "The standard deviation is: 3.39\n" + ] + } + ], + "source": [ + "import statistics\n", + "\n", + "#Average occupation:\n", + "\n", + "average_occupation=round(sum(number_of_passengers)/len(stops))\n", + "print(\"The average occupation of the bus is: \", average_occupation)\n", + "\n", + "\n", + "#Standard Deviation:\n", + "\n", + "bus_dev=round(statistics.stdev(number_of_passengers),2)\n", + "print(\"The standard deviation is: \", bus_dev)" + ] + }, { "cell_type": "code", "execution_count": null, @@ -103,7 +165,7 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 3", + "display_name": "Python 3 (ipykernel)", "language": "python", "name": "python3" }, @@ -117,7 +179,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.7.2" + "version": "3.9.6" } }, "nbformat": 4, diff --git a/1.-Python/4.-Robin-Hood/.ipynb_checkpoints/robin-hood-checkpoint.ipynb b/1.-Python/4.-Robin-Hood/.ipynb_checkpoints/robin-hood-checkpoint.ipynb new file mode 100644 index 000000000..729bdb488 --- /dev/null +++ b/1.-Python/4.-Robin-Hood/.ipynb_checkpoints/robin-hood-checkpoint.ipynb @@ -0,0 +1,234 @@ +{ + "cells": [ + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "# Robin Hood\n", + "Robin Hood has entered a competition to win the archery contest in Sherwood. With his bow and arrows, he needs to shoot on a target and try to hit as close as possible to the center.\n", + "\n", + "![](images/arrows.jpg)\n", + "\n", + "## Context\n", + "In this challenge, the landing position of arrows shot by archers in the competition will be represented using 2-dimensional coordinates. \n", + "\n", + "In the 2-dimensional space, a point can be defined by a pair of values that correspond to the horizontal coordinate (x) and the vertical coordinate (y). For example, in our case, an arrow that hits the center of the archery target will land in position (0, 0) on the coordinate axes. \n", + "\n", + "The space can be divided into 4 zones (quadrants): Q1, Q2, Q3, Q4. If a point is in Q1, both its x coordinate and y coordinate are positive. Any point with a null x or y coordinate is considered to not belong to any quadrant. \n", + "\n", + "If you want to know more about the cartesian coordinate system, you can check this [link](https://en.wikipedia.org/wiki/Cartesian_coordinate_system). \n", + "\n", + "## Tools\n", + "You don't necessarily need to use all the tools. Maybe you opt to use some of them or completely different ones, they are given to help you shape the exercise. Programming exercises can be solved in many different ways.\n", + "* Data structures: **lists, sets, tuples**\n", + "* Conditional statements: **if-elif-else**\n", + "* Loop: **while/for**\n", + "* Minimum (optional sorting)\n", + "\n", + "## Tasks\n", + "Robin Hood has hit the following points:" + ] + }, + { + "cell_type": "code", + "execution_count": 1, + "metadata": {}, + "outputs": [], + "source": [ + "points = [(4, 5), (-0, 2), (4, 7), (1, -3), (3, -2), (4, 5), (3, 2), (5, 7), (-5, 7), (2, 2), (-4, 5), (0, -2),\n", + " (-4, 7), (-1, 3), (-3, 2), (-4, -5), (-3, 2), (5, 7), (5, 7), (2, 2), (9, 9), (-8, -9)]" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 1. Robin Hood is famous for hitting an arrow with another arrow. Find the coordinates of the points where an arrow hits another arrow." + ] + }, + { + "cell_type": "code", + "execution_count": 6, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The coordinates of the points where an arrow hits another arrow: {(-3, 2), (4, 5), (5, 7), (2, 2)}\n" + ] + } + ], + "source": [ + "coord_x = 0\n", + "coord_y = 0\n", + "robin_arrow = []\n", + "for x , y in sorted(points) :\n", + " if coord_x == x and coord_y == y:\n", + " robin_arrow.append( (x,y) )\n", + " coord_x = x\n", + " coord_y = y\n", + "\n", + "robin_arrow=set(robin_arrow)\n", + "print(\"The coordinates of the points where an arrow hits another arrow: \", robin_arrow)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 2. Calculate how many arrows have fallen in each quadrant. \n", + "**Note**: the arrows that fall in the axis (x=0 or y=0) don't belong to any quadrant." + ] + }, + { + "cell_type": "code", + "execution_count": 7, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Arrows in quadrant 1: 10\n", + "Arrows in quadrant 2: 6\n", + "Arrows in quadrant 3: 2\n", + "Arrows in quadrant 4: 2\n" + ] + } + ], + "source": [ + "quadrant_1 = 0\n", + "quadrant_2 = 0\n", + "quadrant_3 = 0\n", + "quadrant_4 = 0\n", + "\n", + "for x , y in sorted(points) :\n", + " if x > 0 and y > 0:\n", + " quadrant_1+= 1\n", + " elif x < 0 and y > 0:\n", + " quadrant_2+= 1\n", + " elif x < 0 and y < 0:\n", + " quadrant_3+= 1\n", + " elif x > 0 and y < 0:\n", + " quadrant_4+= 1\n", + "print(\"Arrows in quadrant 1: \", quadrant_1)\n", + "print(\"Arrows in quadrant 2: \", quadrant_2)\n", + "print(\"Arrows in quadrant 3: \", quadrant_3)\n", + "print(\"Arrows in quadrant 4: \", quadrant_4)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 3. Find the point closest to the center. Calculate its distance to the center. \n", + "Take into account that there might be more than one point at the minimum distance to the center.\n", + "\n", + "**Hint**: Use the Euclidean distance. You can find more information about it [here](https://en.wikipedia.org/wiki/Euclidean_distance). \n", + "**Hint**: Defining a function that calculates the distance to the center can help." + ] + }, + { + "cell_type": "code", + "execution_count": 8, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Point closest to the center: [(0, -2), (0, 2)]\n" + ] + } + ], + "source": [ + "import math\n", + "\n", + "def euclidean_distance(coord):\n", + " distance = math.sqrt(coord[0]**2 + coord[1]**2)\n", + " return distance\n", + "\n", + "dist = []\n", + "min_dist = 0\n", + "min_point = []\n", + "for x , y in sorted(points) :\n", + " distance = euclidean_distance( (x,y) )\n", + " dist.append(distance)\n", + "\n", + "min_dist = min(dist)\n", + "for x , y in sorted(points) :\n", + " distance = euclidean_distance( (x,y) )\n", + " if min(dist) == distance:\n", + " min_point.append( (x,y) )\n", + " \n", + "print(\"Point closest to the center: \", min_point) " + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 4. If the archery target has a radius of 9, calculate the number of arrows that won't hit the target. \n", + "**Hint**: Use the function created in step 3. " + ] + }, + { + "cell_type": "code", + "execution_count": 9, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The number of arrows that won't hit the target is: 2\n" + ] + } + ], + "source": [ + "miss_target = 0\n", + "for distance in dist :\n", + " if distance > 9:\n", + " miss_target+=1\n", + "\n", + "print(\"The number of arrows that won't hit the target is: \", miss_target)" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [] + } + ], + "metadata": { + "kernelspec": { + "display_name": "Python 3 (ipykernel)", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.9.6" + } + }, + "nbformat": 4, + "nbformat_minor": 2 +} diff --git a/1.-Python/4.-Robin-Hood/robin-hood.ipynb b/1.-Python/4.-Robin-Hood/robin-hood.ipynb index 01de29d3b..729bdb488 100644 --- a/1.-Python/4.-Robin-Hood/robin-hood.ipynb +++ b/1.-Python/4.-Robin-Hood/robin-hood.ipynb @@ -38,7 +38,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 1, "metadata": {}, "outputs": [], "source": [ @@ -55,10 +55,30 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 6, "metadata": {}, - "outputs": [], - "source": [] + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The coordinates of the points where an arrow hits another arrow: {(-3, 2), (4, 5), (5, 7), (2, 2)}\n" + ] + } + ], + "source": [ + "coord_x = 0\n", + "coord_y = 0\n", + "robin_arrow = []\n", + "for x , y in sorted(points) :\n", + " if coord_x == x and coord_y == y:\n", + " robin_arrow.append( (x,y) )\n", + " coord_x = x\n", + " coord_y = y\n", + "\n", + "robin_arrow=set(robin_arrow)\n", + "print(\"The coordinates of the points where an arrow hits another arrow: \", robin_arrow)" + ] }, { "cell_type": "markdown", @@ -70,10 +90,40 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 7, "metadata": {}, - "outputs": [], - "source": [] + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Arrows in quadrant 1: 10\n", + "Arrows in quadrant 2: 6\n", + "Arrows in quadrant 3: 2\n", + "Arrows in quadrant 4: 2\n" + ] + } + ], + "source": [ + "quadrant_1 = 0\n", + "quadrant_2 = 0\n", + "quadrant_3 = 0\n", + "quadrant_4 = 0\n", + "\n", + "for x , y in sorted(points) :\n", + " if x > 0 and y > 0:\n", + " quadrant_1+= 1\n", + " elif x < 0 and y > 0:\n", + " quadrant_2+= 1\n", + " elif x < 0 and y < 0:\n", + " quadrant_3+= 1\n", + " elif x > 0 and y < 0:\n", + " quadrant_4+= 1\n", + "print(\"Arrows in quadrant 1: \", quadrant_1)\n", + "print(\"Arrows in quadrant 2: \", quadrant_2)\n", + "print(\"Arrows in quadrant 3: \", quadrant_3)\n", + "print(\"Arrows in quadrant 4: \", quadrant_4)" + ] }, { "cell_type": "markdown", @@ -88,10 +138,39 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 8, "metadata": {}, - "outputs": [], - "source": [] + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Point closest to the center: [(0, -2), (0, 2)]\n" + ] + } + ], + "source": [ + "import math\n", + "\n", + "def euclidean_distance(coord):\n", + " distance = math.sqrt(coord[0]**2 + coord[1]**2)\n", + " return distance\n", + "\n", + "dist = []\n", + "min_dist = 0\n", + "min_point = []\n", + "for x , y in sorted(points) :\n", + " distance = euclidean_distance( (x,y) )\n", + " dist.append(distance)\n", + "\n", + "min_dist = min(dist)\n", + "for x , y in sorted(points) :\n", + " distance = euclidean_distance( (x,y) )\n", + " if min(dist) == distance:\n", + " min_point.append( (x,y) )\n", + " \n", + "print(\"Point closest to the center: \", min_point) " + ] }, { "cell_type": "markdown", @@ -101,6 +180,28 @@ "**Hint**: Use the function created in step 3. " ] }, + { + "cell_type": "code", + "execution_count": 9, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The number of arrows that won't hit the target is: 2\n" + ] + } + ], + "source": [ + "miss_target = 0\n", + "for distance in dist :\n", + " if distance > 9:\n", + " miss_target+=1\n", + "\n", + "print(\"The number of arrows that won't hit the target is: \", miss_target)" + ] + }, { "cell_type": "code", "execution_count": null, @@ -111,7 +212,7 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 3", + "display_name": "Python 3 (ipykernel)", "language": "python", "name": "python3" }, @@ -125,7 +226,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.7.2" + "version": "3.9.6" } }, "nbformat": 4, diff --git a/1.-Python/5.-Temperature-Processor/.ipynb_checkpoints/temperature-checkpoint.ipynb b/1.-Python/5.-Temperature-Processor/.ipynb_checkpoints/temperature-checkpoint.ipynb new file mode 100644 index 000000000..c159c9f3a --- /dev/null +++ b/1.-Python/5.-Temperature-Processor/.ipynb_checkpoints/temperature-checkpoint.ipynb @@ -0,0 +1,411 @@ +{ + "cells": [ + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "# Temperature Sensor\n", + "\n", + "There is a temperature sensor in the processor of your company's server. The company wants to analyze the data provided by the sensor to decide if they should change the cooling system for a better one. As changing the cooling system is expensive and you are an excellent data analyst, you can't make a decision without basis.\n", + "\n", + "## Tools\n", + "You don't necessarily need to use all the tools. Maybe you opt to use some of them or completely different ones, they are given to help you shape the exercise. Programming exercises can be solved in many different ways.\n", + "1. Data structures: **lists**\n", + "2. Loops: **list comprehension**\n", + "3. Functions: **min, max, print, len**\n", + "4. Conditional statements: **if-elif-else**\n", + "\n", + "## Tasks\n", + "The temperatures measured throughout the 24 hours of a day are:" + ] + }, + { + "cell_type": "code", + "execution_count": 9, + "metadata": {}, + "outputs": [], + "source": [ + "temperatures_C = [33, 66, 65, 0, 59, 60, 62, 64, 70, 76, 80, 81, 80, 83, 90, 79, 61, 53, 50, 49, 53, 48, 45, 39]" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "The first element of the list is the temperature at 12am, the second element is the temperature at 1am, and so on. \n", + "\n", + "The company has decided that if one of the following events occurs, then the cooling system needs to be replaced for a new one to avoid damaging the processor.\n", + "* More than 4 temperatures are greater than or equal to 70ºC.\n", + "* Any temperature is above 80ºC.\n", + "* The average temperature exceeds 65ºC.\n", + "\n", + "Follow the steps so that you can make the decision.\n", + "\n", + "#### 1. Find the minimum temperature of the day and store it in a variable." + ] + }, + { + "cell_type": "code", + "execution_count": 10, + "metadata": {}, + "outputs": [], + "source": [ + "min_temp = min(temperatures_C)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 2. Find the maximum temperature of the day and store it in a variable." + ] + }, + { + "cell_type": "code", + "execution_count": 11, + "metadata": {}, + "outputs": [], + "source": [ + "max_temp = max(temperatures_C)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 3. Create a list with the temperatures that are greater than or equal to 70ºC. Store it in a variable." + ] + }, + { + "cell_type": "code", + "execution_count": 12, + "metadata": {}, + "outputs": [], + "source": [ + "temp_greater_equal_70 = []\n", + "\n", + "for temp in temperatures_C:\n", + " if temp >= 70:\n", + " temp_greater_equal_70.append(temp)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 4. Find the average temperature of the day and store it in a variable." + ] + }, + { + "cell_type": "code", + "execution_count": 13, + "metadata": {}, + "outputs": [], + "source": [ + "average_temp = round(sum(temperatures_C)/len(temperatures_C),2)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 5. Imagine that there was a sensor failure at 3am and the data for that specific hour was not recorded. How would you estimate the missing value? Replace the current value of the list at 3am for an estimation. " + ] + }, + { + "cell_type": "code", + "execution_count": 14, + "metadata": {}, + "outputs": [], + "source": [ + "temperatures_C[3]= int((temperatures_C[2] + temperatures_C[4]) / 2 )" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 6. Bonus: the maintenance staff is from the United States and does not understand the international metric system. Help them by converting the temperatures from Celsius to Fahrenheit.\n", + "To know more about temperature conversion check this [link](https://en.wikipedia.org/wiki/Conversion_of_units_of_temperature).\n", + "\n", + "**Formula**: \n", + "\n", + "$F = 1.8 * C + 32$" + ] + }, + { + "cell_type": "code", + "execution_count": 15, + "metadata": {}, + "outputs": [], + "source": [ + "def conv_temp_fahrenheit(temp_c):\n", + " temp_fah = round(1.8*temp_c + 32, 2)\n", + " return temp_fah\n", + "\n", + "temperatures_F =[]\n", + "for temp in temperatures_C:\n", + " temperatures_F.append(conv_temp_fahrenheit(temp))" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 7. Make a decision!\n", + "Now it's time to make a decision taking into account what you have seen until now. \n", + "\n", + "Remember that if one of the following events occurs, then the cooling system needs to be replaced for a new one to avoid damaging the processor.\n", + "* More than 4 temperatures are greater than or equal to 70ºC.\n", + "* Any temperature is above 80ºC.\n", + "* The average temperature exceeds 65ºC.\n", + "\n", + "#### To make your decision, check if any of the three conditions above is met. You might need to use some of the variables you created in steps 1 to 6. Print a message to show if the cooling system needs to be changed or not." + ] + }, + { + "cell_type": "code", + "execution_count": 16, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "- more than 4 temperatures exceed 70\n", + "- a temperature is above 80ºC.\n", + "the system must be replaced\n" + ] + } + ], + "source": [ + "cond = 0\n", + "\n", + "if len(temp_greater_equal_70) > 4:\n", + " print(\"- more than 4 temperatures exceed 70\")\n", + " cond += 1\n", + "if max_temp > 80:\n", + " print(\"- a temperature is above 80ºC.\")\n", + " cond += 1\n", + "if average_temp > 65:\n", + " print(\"- average temperature exceeds 65\")\n", + " cond += 1\n", + " \n", + " print(str(cond)+\" conditions are met\")\n", + "if cond > 0:\n", + " print(\"the system must be replaced\")\n", + "else:\n", + " print(\"the system does not need to be replaced\")" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## Bonus\n", + "\n", + "The company has decided that the decision you made is not valid. They want you to analyze the data again but this time, the conditions that need to be met in order to change the cooling system are different.\n", + "\n", + "This time, if one of the following events occurs, then the cooling system needs to be replaced:\n", + "* The temperature is greater than 70ºC during more than 4 consecutive hours.\n", + "* Any temperature is above 80ºC.\n", + "* The average temperature exceeds 65ºC.\n", + "\n", + "Follow the steps so that you can make the decision.\n", + "\n", + "#### 1. Create a list with the hours where the temperature is greater than 70ºC. Store it in a variable." + ] + }, + { + "cell_type": "code", + "execution_count": 19, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The hours where the T is greater than 70 are: [8, 9, 10, 11, 12, 13, 14, 15]\n" + ] + } + ], + "source": [ + "hours_temp_greater_70 = [i for i, v in enumerate(temperatures_C) if v >=70]\n", + "print(\"The hours where the T is greater than 70 are:\", hours_temp_greater70)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 2. Check if the list you created in step 1 has more than 4 consecutive hours. " + ] + }, + { + "cell_type": "code", + "execution_count": 20, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The condition of more than 4 consecutive time periods with T<= 70 ºC is met.\n" + ] + } + ], + "source": [ + "consec_hours = 0\n", + "\n", + "for i in range(len(hours_temp_greater_70)-1):\n", + " if (hours_temp_greater_70[i+1] - hours_temp_greater_70[i] == 1):\n", + " consec_hours +=1\n", + " else: \n", + " consec_hours = 0 \n", + " if consec_hours > 4: \n", + " print(\"The condition of more than 4 consecutive time periods with T<= 70 ºC is met.\")\n", + " break" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 3. Make the decision!\n", + "To make your decision, check if any of the three conditions is met. Print a message to show if the cooling system needs to be changed or not." + ] + }, + { + "cell_type": "code", + "execution_count": 21, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The condition of more than 4 consecutive time periods with T<= 70 ºC is met.\n", + "- a temperature is above 80ºC.\n", + "the system must be replaced\n" + ] + } + ], + "source": [ + "cond = 0\n", + "\n", + "if consec_hours > 4:\n", + " print(\"The condition of more than 4 consecutive time periods with T<= 70 ºC is met.\")\n", + " cond += 1\n", + "if max_temp > 80:\n", + " print(\"- a temperature is above 80ºC.\")\n", + " cond += 1\n", + "if average_temp > 65:\n", + " print(\"- average temperature exceeds 65\")\n", + " cond += 1\n", + " print(str(cond)+\" conditions are met\")\n", + "if cond > 0:\n", + " print(\"the system must be replaced\")\n", + "else:\n", + " print(\"the system does not need to be replaced\")" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 4. Find the average value of the temperature lists (ºC and ºF). What is the relation between both average values?" + ] + }, + { + "cell_type": "code", + "execution_count": 22, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The relationship between both average temperatures is: 2.31 and is given by the formula to convert degrees Celsius to Fahrenheit\n" + ] + } + ], + "source": [ + "average_temp_c = round(sum(temperatures_C)/len(temperatures_C),2)\n", + "average_temp_f = round(sum(temperatures_F)/len(temperatures_F),2)\n", + "temp_average_rel=round(average_temp_f/average_temp_c,2)\n", + "\n", + "print(\"The relationship between both average temperatures is: {} and is given by the formula to convert degrees Celsius to Fahrenheit\".format(temp_average_rel))\n" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 5. Find the standard deviation of the temperature lists (ºC and ºF). What is the relation between both standard deviations?" + ] + }, + { + "cell_type": "code", + "execution_count": 23, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The Standard Deviation in Celsius is: 14.95\n", + "The standard deviation in Fahrenheit is: 26.91\n", + "The relationship between both standard deviations is: 1.8 and is given by the slope of the line that represents the relationship between Celsius and Fahrenheit, this value being 1.8\n" + ] + } + ], + "source": [ + "import statistics\n", + "\n", + "desv_c= round(statistics.stdev(temperatures_C),2)\n", + "print(\"The Standard Deviation in Celsius is: \", desv_c)\n", + "\n", + "desv_f= round(statistics.stdev(temperatures_F),2)\n", + "print(\"The standard deviation in Fahrenheit is: \", desv_f)\n", + "\n", + "desv_rel= round(desv_f/desv_c,2)\n", + "print(\"The relationship between both standard deviations is: {} and is given by the slope of the line that represents the relationship between Celsius and Fahrenheit, this value being 1.8\".format(desv_rel))\n" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [] + } + ], + "metadata": { + "kernelspec": { + "display_name": "Python 3 (ipykernel)", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.9.6" + } + }, + "nbformat": 4, + "nbformat_minor": 2 +} diff --git a/1.-Python/5.-Temperature-Processor/temperature.ipynb b/1.-Python/5.-Temperature-Processor/temperature.ipynb index 4b597aa20..c159c9f3a 100644 --- a/1.-Python/5.-Temperature-Processor/temperature.ipynb +++ b/1.-Python/5.-Temperature-Processor/temperature.ipynb @@ -28,7 +28,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 9, "metadata": {}, "outputs": [], "source": [ @@ -53,10 +53,12 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 10, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "min_temp = min(temperatures_C)" + ] }, { "cell_type": "markdown", @@ -67,10 +69,12 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 11, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "max_temp = max(temperatures_C)" + ] }, { "cell_type": "markdown", @@ -81,10 +85,16 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 12, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "temp_greater_equal_70 = []\n", + "\n", + "for temp in temperatures_C:\n", + " if temp >= 70:\n", + " temp_greater_equal_70.append(temp)" + ] }, { "cell_type": "markdown", @@ -95,10 +105,12 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 13, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "average_temp = round(sum(temperatures_C)/len(temperatures_C),2)" + ] }, { "cell_type": "markdown", @@ -109,10 +121,12 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 14, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "temperatures_C[3]= int((temperatures_C[2] + temperatures_C[4]) / 2 )" + ] }, { "cell_type": "markdown", @@ -128,10 +142,18 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 15, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "def conv_temp_fahrenheit(temp_c):\n", + " temp_fah = round(1.8*temp_c + 32, 2)\n", + " return temp_fah\n", + "\n", + "temperatures_F =[]\n", + "for temp in temperatures_C:\n", + " temperatures_F.append(conv_temp_fahrenheit(temp))" + ] }, { "cell_type": "markdown", @@ -150,10 +172,38 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 16, "metadata": {}, - "outputs": [], - "source": [] + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "- more than 4 temperatures exceed 70\n", + "- a temperature is above 80ºC.\n", + "the system must be replaced\n" + ] + } + ], + "source": [ + "cond = 0\n", + "\n", + "if len(temp_greater_equal_70) > 4:\n", + " print(\"- more than 4 temperatures exceed 70\")\n", + " cond += 1\n", + "if max_temp > 80:\n", + " print(\"- a temperature is above 80ºC.\")\n", + " cond += 1\n", + "if average_temp > 65:\n", + " print(\"- average temperature exceeds 65\")\n", + " cond += 1\n", + " \n", + " print(str(cond)+\" conditions are met\")\n", + "if cond > 0:\n", + " print(\"the system must be replaced\")\n", + "else:\n", + " print(\"the system does not need to be replaced\")" + ] }, { "cell_type": "markdown", @@ -175,10 +225,21 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 19, "metadata": {}, - "outputs": [], - "source": [] + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The hours where the T is greater than 70 are: [8, 9, 10, 11, 12, 13, 14, 15]\n" + ] + } + ], + "source": [ + "hours_temp_greater_70 = [i for i, v in enumerate(temperatures_C) if v >=70]\n", + "print(\"The hours where the T is greater than 70 are:\", hours_temp_greater70)" + ] }, { "cell_type": "markdown", @@ -189,10 +250,29 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 20, "metadata": {}, - "outputs": [], - "source": [] + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The condition of more than 4 consecutive time periods with T<= 70 ºC is met.\n" + ] + } + ], + "source": [ + "consec_hours = 0\n", + "\n", + "for i in range(len(hours_temp_greater_70)-1):\n", + " if (hours_temp_greater_70[i+1] - hours_temp_greater_70[i] == 1):\n", + " consec_hours +=1\n", + " else: \n", + " consec_hours = 0 \n", + " if consec_hours > 4: \n", + " print(\"The condition of more than 4 consecutive time periods with T<= 70 ºC is met.\")\n", + " break" + ] }, { "cell_type": "markdown", @@ -204,10 +284,37 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 21, "metadata": {}, - "outputs": [], - "source": [] + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The condition of more than 4 consecutive time periods with T<= 70 ºC is met.\n", + "- a temperature is above 80ºC.\n", + "the system must be replaced\n" + ] + } + ], + "source": [ + "cond = 0\n", + "\n", + "if consec_hours > 4:\n", + " print(\"The condition of more than 4 consecutive time periods with T<= 70 ºC is met.\")\n", + " cond += 1\n", + "if max_temp > 80:\n", + " print(\"- a temperature is above 80ºC.\")\n", + " cond += 1\n", + "if average_temp > 65:\n", + " print(\"- average temperature exceeds 65\")\n", + " cond += 1\n", + " print(str(cond)+\" conditions are met\")\n", + "if cond > 0:\n", + " print(\"the system must be replaced\")\n", + "else:\n", + " print(\"the system does not need to be replaced\")" + ] }, { "cell_type": "markdown", @@ -218,10 +325,24 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 22, "metadata": {}, - "outputs": [], - "source": [] + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The relationship between both average temperatures is: 2.31 and is given by the formula to convert degrees Celsius to Fahrenheit\n" + ] + } + ], + "source": [ + "average_temp_c = round(sum(temperatures_C)/len(temperatures_C),2)\n", + "average_temp_f = round(sum(temperatures_F)/len(temperatures_F),2)\n", + "temp_average_rel=round(average_temp_f/average_temp_c,2)\n", + "\n", + "print(\"The relationship between both average temperatures is: {} and is given by the formula to convert degrees Celsius to Fahrenheit\".format(temp_average_rel))\n" + ] }, { "cell_type": "markdown", @@ -230,6 +351,34 @@ "#### 5. Find the standard deviation of the temperature lists (ºC and ºF). What is the relation between both standard deviations?" ] }, + { + "cell_type": "code", + "execution_count": 23, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The Standard Deviation in Celsius is: 14.95\n", + "The standard deviation in Fahrenheit is: 26.91\n", + "The relationship between both standard deviations is: 1.8 and is given by the slope of the line that represents the relationship between Celsius and Fahrenheit, this value being 1.8\n" + ] + } + ], + "source": [ + "import statistics\n", + "\n", + "desv_c= round(statistics.stdev(temperatures_C),2)\n", + "print(\"The Standard Deviation in Celsius is: \", desv_c)\n", + "\n", + "desv_f= round(statistics.stdev(temperatures_F),2)\n", + "print(\"The standard deviation in Fahrenheit is: \", desv_f)\n", + "\n", + "desv_rel= round(desv_f/desv_c,2)\n", + "print(\"The relationship between both standard deviations is: {} and is given by the slope of the line that represents the relationship between Celsius and Fahrenheit, this value being 1.8\".format(desv_rel))\n" + ] + }, { "cell_type": "code", "execution_count": null, @@ -240,7 +389,7 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 3", + "display_name": "Python 3 (ipykernel)", "language": "python", "name": "python3" }, @@ -254,7 +403,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.7.2" + "version": "3.9.6" } }, "nbformat": 4, diff --git "a/1.-Python/6.-Rock\342\200\223Paper\342\200\223Scissors/.ipynb_checkpoints/rock-paper-scissors-checkpoint.ipynb" "b/1.-Python/6.-Rock\342\200\223Paper\342\200\223Scissors/.ipynb_checkpoints/rock-paper-scissors-checkpoint.ipynb" new file mode 100644 index 000000000..4c47c211b --- /dev/null +++ "b/1.-Python/6.-Rock\342\200\223Paper\342\200\223Scissors/.ipynb_checkpoints/rock-paper-scissors-checkpoint.ipynb" @@ -0,0 +1,436 @@ +{ + "cells": [ + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "# Rock, Paper & Scissors\n", + "\n", + "Let's play the famous game against our computer. You can check the rules [here](https://en.wikipedia.org/wiki/Rock%E2%80%93paper%E2%80%93scissors). \n", + "\n", + "## Task\n", + "Create a program that imitates the playability of the well known game of rock, paper, scissors. Follow the guidelines provided.\n", + "\n", + "## Tools\n", + "1. Loop: **for/while**\n", + "2. Functions: **input(), print()...**\n", + "3. Conditional statements: **if, elif, else**\n", + "4. Definition of functions. Modular programming\n", + "5. Import modules\n", + "\n", + "**To solve this challenge, the use of functions is recommended.**\n", + "\n", + "#### 1. Import the choice function of the random module." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "from random import choice" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 2. Create a list that includes the 3 possible gesture options of the game: 'rock', 'paper' or 'scissors'. Store the list in a variable called `gestures`." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "gestures = ['stone', 'paper', 'scissors']" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 3. Create a variable called `n_rounds` to store the maximum number of rounds to play in a game. \n", + "Remember that the number of rounds must be odd: 1, 3, 5, ..." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "n_rounds = 3" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 4. Create a variable called `rounds_to_win` to store the number of rounds that a player must win to win the game.\n", + "**Hint**: the value stored in `rounds_to_win` depends on the value of `n_rounds`. " + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "rounds_to_win = int(n_rounds / 2) + 1" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 5. Create two variables to store the number of rounds that the computer and the player have won. Call these variables `cpu_score` and `player_score`." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "cpu_score = 0\n", + "player_score = 0" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 6. Define a function that randomly returns one of the 3 gesture options.\n", + "You will use this function to simulate the gesture choice of the computer. " + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "def random_gesture(gesture):\n", + " return choice(gesture)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 7. Define a function that asks the player which is the gesture he or she wants to show: 'rock', 'paper' or 'scissors'.\n", + "The player should only be allowed to choose one of the 3 gesture options. If the player's choice is not rock, paper or scissors, keep asking until it is." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "def player_gesture(gesture):\n", + " option= ''\n", + " while option not in gesture:\n", + " option = input(\"Please choose rock, paper or scissors: \" )\n", + " if option in gesture:\n", + " return option\n", + " else:\n", + " print(\"Incorrect\")" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 8. Define a function that checks who won a round. \n", + "The function should return 0 if there is a tie, 1 if the computer wins and 2 if the player wins." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "def who_won_round(player_option, cpu_option):\n", + " if player_option == 'paper' and cpu_option == 'rock':\n", + " print(\"Player Wins\")\n", + " return 2\n", + " elif player_option == 'scissors' and cpu_option == 'paper':\n", + " print(\"Player Wins\")\n", + " return 2\n", + " elif player_option == 'rock' and cpu_option == 'scissors':\n", + " print(\"Player Wins\")\n", + " return 2\n", + " elif player_option == cpu_option:\n", + " print(\"Tie\")\n", + " return 0\n", + " else:\n", + " print(\"CPU Wins\")\n", + " return 1" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 9. Define a function that prints the choice of the computer, the choice of the player and a message that announces who won the current round. \n", + "You should also use this function to update the variables that count the number of rounds that the computer and the player have won. The score of the winner increases by one point. If there is a tie, the score does not increase." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "def game(player_option, cpu_option):\n", + " print(\"Player use: \"+player_option)\n", + " print(\"CPU use: \"+cpu_option)\n", + " winner = who_won_round(player_option , cpu_option)\n", + " if winner == 2:\n", + " return 2\n", + " elif winner == 1:\n", + " return 1 " + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 10. Now it's time to code the execution of the game using the functions and variables you defined above. \n", + "\n", + "First, create a loop structure that repeats while no player reaches the minimum score necessary to win and the number of rounds is less than the maximum number of rounds to play in a game. \n", + "\n", + "Inside the loop, use the functions and variables above to create the execution of a round: ask for the player's choice, generate the random choice of the computer, show the round results, update the scores, etc. " + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "while player_score < rounds_to_win and cpu_score < rounds_to_win:\n", + " cpu_option= random_gesture(gestures)\n", + " player_option= player_gesture(gestures)\n", + " round_winner= game(player_option, cpu_option)\n", + " if round_winner == 2:\n", + " player_score+=1\n", + " elif round_winner == 1:\n", + " cpu_score+=1 " + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### 11. Print the winner of the game based on who won more rounds.\n", + "Remember that the game might be tied. " + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "if player_score > cpu_score:\n", + " print(\"Player wins the game\")\n", + "else:\n", + " print(\"CPU wins the game\")" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "# Bonus: Rock, Paper, Scissors, Lizard & Spock\n", + "![](images/rpsls.jpg)\n", + "\n", + "In this challenge, you need to improve the previous game by adding two new options. To know more about the rules of the improved version of rock, paper, scissors, check this [link](http://www.samkass.com/theories/RPSSL.html). \n", + "\n", + "In addition, you will also need to improve how the game interacts with the player: the number of rounds to play, which must be an odd number, will be requested to the user until a valid number is entered. Define a new function to make that request.\n", + "\n", + "**Hint**: Try to reuse the code that you already coded in the previous challenge. If your code is efficient, this bonus will only consist of simple modifications to the original game." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "from random import choice\n", + "\n", + "gestures = ['stone', 'paper', 'scissors', 'lizard', 'spock']\n", + "\n", + "def max_games():\n", + " n_rounds = float(input(\"How many games wanna play? Please enter an ODD number: \"))\n", + " while (n_rounds %2 == 0):\n", + " print(n_rounds);\n", + " n_rounds = float(input(\"This is not an ODD number. Please enter an ODD number again: \"));\n", + " \n", + " return n_rounds\n", + "\n", + "def cpu_choice(): \n", + " return choice(gestures)\n", + "\n", + "def player_choice():\n", + " player = input(\"Write your choice (stone/paper/scissors/lizard/spock): \")\n", + " player = player.lower();\n", + " while (player != \"stone\" and player != \"paper\" and player != \"scissors\" and player != \"lizard\" and player != \"spock\"):\n", + " print(player);\n", + " player = input(\"That choice is not valid. Enter your choice (stone/paper/scissors/lizard/spock): \");\n", + " player = player.lower();\n", + " return player\n", + "\n", + "def game(player_points, cpu_points, rounds_to_win): \n", + " if cpu_points == player_points: \n", + " game_result = 0\n", + " elif cpu_points >= rounds_to_win:\n", + " game_result = 1\n", + " elif player_points >= rounds_to_win: \n", + " game_result = 2\n", + " return game_result\n", + "\n", + "def game_winner(result_game): \n", + " if result_game == 0:\n", + " print('0. There is a TIE! Play again')\n", + " elif result_game == 1: \n", + " print('1. I am sorry. The computer has won')\n", + " elif result_game == 2: \n", + " print('2. Congratulations. You have won!')\n", + " \n", + "def game_status():\n", + " n_rounds = max_games()\n", + " rounds_to_win = (n_rounds + 1)/2\n", + " current_game = 0 \n", + " cpu_acc_points = 0 \n", + " player_acc_points = 0\n", + " \n", + " while cpu_acc_points < rounds_to_win and player_acc_points < rounds_to_win and current_game < n_rounds:\n", + " print('Current game:', current_game)\n", + " user_choice = player_choice()\n", + " computer_choice = cpu_choice()\n", + " print('Computer choice:', computer_choice)\n", + " if computer_choice == user_choice:\n", + " pass\n", + " elif computer_choice == 'stone': \n", + " if user_choice == 'scissors': \n", + " cpu_acc_points +=1\n", + " \n", + " elif user_choice == 'lizard': \n", + " cpu_acc_points +=1\n", + " \n", + " elif user_choice == 'paper': \n", + " player_acc_points +=1\n", + " \n", + " elif user_choice == 'spock': \n", + " player_acc_points +=1\n", + " \n", + " elif computer_choice == 'paper': \n", + " if user_choice == 'stone': \n", + " cpu_acc_points += 1\n", + " \n", + " elif user_choice == 'spock': \n", + " cpu_acc_points += 1\n", + " \n", + " elif user_choice == 'scissors': \n", + " player_acc_points += 1\n", + " \n", + " elif user_choice == 'lizard': \n", + " player_acc_points += 1 \n", + " \n", + " elif computer_choice == 'scissors': \n", + " if user_choice == 'stone': \n", + " player_acc_points +=1\n", + " \n", + " elif user_choice == 'spock': \n", + " player_acc_points +=1 \n", + " \n", + " elif user_choice == 'paper': \n", + " cpu_acc_points += 1\n", + " \n", + " elif user_choice == 'lizard': \n", + " cpu_acc_points += 1\n", + " \n", + " elif computer_choice == 'lizard': \n", + " if user_choice == 'paper': \n", + " cpu_acc_points += 1\n", + " \n", + " elif user_choice == 'spock': \n", + " cpu_acc_points += 1\n", + " \n", + " elif user_choice == 'scissors': \n", + " player_acc_points += 1\n", + " \n", + " elif user_choice == 'stone': \n", + " player_acc_points += 1\n", + " \n", + " elif computer_choice == 'spock': \n", + " if user_choice == 'stone': \n", + " cpu_acc_points += 1\n", + " \n", + " elif user_choice == 'scissors': \n", + " cpu_acc_points += 1\n", + " \n", + " elif user_choice == 'paper': \n", + " player_acc_points += 1\n", + " \n", + " elif user_choice == 'lizard': \n", + " player_acc_points += 1 \n", + " \n", + " else: \n", + " print('Wrong input. Try again!')\n", + " \n", + " current_game += 1\n", + " print('User points:', player_acc_points)\n", + " print('Computer points:', cpu_acc_points)\n", + " game_winner = game(player_acc_points, cpu_acc_points, rounds_to_win)\n", + " return game_winner\n", + "\n", + "winner = game_status()\n", + "game_winner(winner)" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [] + } + ], + "metadata": { + "kernelspec": { + "display_name": "Python 3 (ipykernel)", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.9.6" + } + }, + "nbformat": 4, + "nbformat_minor": 2 +} diff --git "a/1.-Python/6.-Rock\342\200\223Paper\342\200\223Scissors/rock-paper-scissors.ipynb" "b/1.-Python/6.-Rock\342\200\223Paper\342\200\223Scissors/rock-paper-scissors.ipynb" index 9e551dfd4..4c47c211b 100644 --- "a/1.-Python/6.-Rock\342\200\223Paper\342\200\223Scissors/rock-paper-scissors.ipynb" +++ "b/1.-Python/6.-Rock\342\200\223Paper\342\200\223Scissors/rock-paper-scissors.ipynb" @@ -35,7 +35,9 @@ "execution_count": null, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "from random import choice" + ] }, { "cell_type": "markdown", @@ -49,7 +51,9 @@ "execution_count": null, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "gestures = ['stone', 'paper', 'scissors']" + ] }, { "cell_type": "markdown", @@ -64,7 +68,9 @@ "execution_count": null, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "n_rounds = 3" + ] }, { "cell_type": "markdown", @@ -79,7 +85,9 @@ "execution_count": null, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "rounds_to_win = int(n_rounds / 2) + 1" + ] }, { "cell_type": "markdown", @@ -93,7 +101,10 @@ "execution_count": null, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "cpu_score = 0\n", + "player_score = 0" + ] }, { "cell_type": "markdown", @@ -108,7 +119,10 @@ "execution_count": null, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "def random_gesture(gesture):\n", + " return choice(gesture)" + ] }, { "cell_type": "markdown", @@ -123,7 +137,16 @@ "execution_count": null, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "def player_gesture(gesture):\n", + " option= ''\n", + " while option not in gesture:\n", + " option = input(\"Please choose rock, paper or scissors: \" )\n", + " if option in gesture:\n", + " return option\n", + " else:\n", + " print(\"Incorrect\")" + ] }, { "cell_type": "markdown", @@ -138,7 +161,24 @@ "execution_count": null, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "def who_won_round(player_option, cpu_option):\n", + " if player_option == 'paper' and cpu_option == 'rock':\n", + " print(\"Player Wins\")\n", + " return 2\n", + " elif player_option == 'scissors' and cpu_option == 'paper':\n", + " print(\"Player Wins\")\n", + " return 2\n", + " elif player_option == 'rock' and cpu_option == 'scissors':\n", + " print(\"Player Wins\")\n", + " return 2\n", + " elif player_option == cpu_option:\n", + " print(\"Tie\")\n", + " return 0\n", + " else:\n", + " print(\"CPU Wins\")\n", + " return 1" + ] }, { "cell_type": "markdown", @@ -153,7 +193,16 @@ "execution_count": null, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "def game(player_option, cpu_option):\n", + " print(\"Player use: \"+player_option)\n", + " print(\"CPU use: \"+cpu_option)\n", + " winner = who_won_round(player_option , cpu_option)\n", + " if winner == 2:\n", + " return 2\n", + " elif winner == 1:\n", + " return 1 " + ] }, { "cell_type": "markdown", @@ -171,7 +220,16 @@ "execution_count": null, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "while player_score < rounds_to_win and cpu_score < rounds_to_win:\n", + " cpu_option= random_gesture(gestures)\n", + " player_option= player_gesture(gestures)\n", + " round_winner= game(player_option, cpu_option)\n", + " if round_winner == 2:\n", + " player_score+=1\n", + " elif round_winner == 1:\n", + " cpu_score+=1 " + ] }, { "cell_type": "markdown", @@ -186,7 +244,12 @@ "execution_count": null, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "if player_score > cpu_score:\n", + " print(\"Player wins the game\")\n", + "else:\n", + " print(\"CPU wins the game\")" + ] }, { "cell_type": "markdown", @@ -202,6 +265,145 @@ "**Hint**: Try to reuse the code that you already coded in the previous challenge. If your code is efficient, this bonus will only consist of simple modifications to the original game." ] }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "from random import choice\n", + "\n", + "gestures = ['stone', 'paper', 'scissors', 'lizard', 'spock']\n", + "\n", + "def max_games():\n", + " n_rounds = float(input(\"How many games wanna play? Please enter an ODD number: \"))\n", + " while (n_rounds %2 == 0):\n", + " print(n_rounds);\n", + " n_rounds = float(input(\"This is not an ODD number. Please enter an ODD number again: \"));\n", + " \n", + " return n_rounds\n", + "\n", + "def cpu_choice(): \n", + " return choice(gestures)\n", + "\n", + "def player_choice():\n", + " player = input(\"Write your choice (stone/paper/scissors/lizard/spock): \")\n", + " player = player.lower();\n", + " while (player != \"stone\" and player != \"paper\" and player != \"scissors\" and player != \"lizard\" and player != \"spock\"):\n", + " print(player);\n", + " player = input(\"That choice is not valid. Enter your choice (stone/paper/scissors/lizard/spock): \");\n", + " player = player.lower();\n", + " return player\n", + "\n", + "def game(player_points, cpu_points, rounds_to_win): \n", + " if cpu_points == player_points: \n", + " game_result = 0\n", + " elif cpu_points >= rounds_to_win:\n", + " game_result = 1\n", + " elif player_points >= rounds_to_win: \n", + " game_result = 2\n", + " return game_result\n", + "\n", + "def game_winner(result_game): \n", + " if result_game == 0:\n", + " print('0. There is a TIE! Play again')\n", + " elif result_game == 1: \n", + " print('1. I am sorry. The computer has won')\n", + " elif result_game == 2: \n", + " print('2. Congratulations. You have won!')\n", + " \n", + "def game_status():\n", + " n_rounds = max_games()\n", + " rounds_to_win = (n_rounds + 1)/2\n", + " current_game = 0 \n", + " cpu_acc_points = 0 \n", + " player_acc_points = 0\n", + " \n", + " while cpu_acc_points < rounds_to_win and player_acc_points < rounds_to_win and current_game < n_rounds:\n", + " print('Current game:', current_game)\n", + " user_choice = player_choice()\n", + " computer_choice = cpu_choice()\n", + " print('Computer choice:', computer_choice)\n", + " if computer_choice == user_choice:\n", + " pass\n", + " elif computer_choice == 'stone': \n", + " if user_choice == 'scissors': \n", + " cpu_acc_points +=1\n", + " \n", + " elif user_choice == 'lizard': \n", + " cpu_acc_points +=1\n", + " \n", + " elif user_choice == 'paper': \n", + " player_acc_points +=1\n", + " \n", + " elif user_choice == 'spock': \n", + " player_acc_points +=1\n", + " \n", + " elif computer_choice == 'paper': \n", + " if user_choice == 'stone': \n", + " cpu_acc_points += 1\n", + " \n", + " elif user_choice == 'spock': \n", + " cpu_acc_points += 1\n", + " \n", + " elif user_choice == 'scissors': \n", + " player_acc_points += 1\n", + " \n", + " elif user_choice == 'lizard': \n", + " player_acc_points += 1 \n", + " \n", + " elif computer_choice == 'scissors': \n", + " if user_choice == 'stone': \n", + " player_acc_points +=1\n", + " \n", + " elif user_choice == 'spock': \n", + " player_acc_points +=1 \n", + " \n", + " elif user_choice == 'paper': \n", + " cpu_acc_points += 1\n", + " \n", + " elif user_choice == 'lizard': \n", + " cpu_acc_points += 1\n", + " \n", + " elif computer_choice == 'lizard': \n", + " if user_choice == 'paper': \n", + " cpu_acc_points += 1\n", + " \n", + " elif user_choice == 'spock': \n", + " cpu_acc_points += 1\n", + " \n", + " elif user_choice == 'scissors': \n", + " player_acc_points += 1\n", + " \n", + " elif user_choice == 'stone': \n", + " player_acc_points += 1\n", + " \n", + " elif computer_choice == 'spock': \n", + " if user_choice == 'stone': \n", + " cpu_acc_points += 1\n", + " \n", + " elif user_choice == 'scissors': \n", + " cpu_acc_points += 1\n", + " \n", + " elif user_choice == 'paper': \n", + " player_acc_points += 1\n", + " \n", + " elif user_choice == 'lizard': \n", + " player_acc_points += 1 \n", + " \n", + " else: \n", + " print('Wrong input. Try again!')\n", + " \n", + " current_game += 1\n", + " print('User points:', player_acc_points)\n", + " print('Computer points:', cpu_acc_points)\n", + " game_winner = game(player_acc_points, cpu_acc_points, rounds_to_win)\n", + " return game_winner\n", + "\n", + "winner = game_status()\n", + "game_winner(winner)" + ] + }, { "cell_type": "code", "execution_count": null, @@ -212,7 +414,7 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 3", + "display_name": "Python 3 (ipykernel)", "language": "python", "name": "python3" }, @@ -226,7 +428,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.7.2" + "version": "3.9.6" } }, "nbformat": 4, diff --git a/2.-Statistics/Coursera Week 1.pdf b/2.-Statistics/Coursera Week 1.pdf new file mode 100644 index 000000000..865b20133 Binary files /dev/null and b/2.-Statistics/Coursera Week 1.pdf differ diff --git a/2.-Statistics/Coursera Week 2.pdf b/2.-Statistics/Coursera Week 2.pdf new file mode 100644 index 000000000..0ad2cf6c3 Binary files /dev/null and b/2.-Statistics/Coursera Week 2.pdf differ diff --git a/2.-Statistics/Coursera Week 3.pdf b/2.-Statistics/Coursera Week 3.pdf new file mode 100644 index 000000000..ce57a7507 Binary files /dev/null and b/2.-Statistics/Coursera Week 3.pdf differ diff --git a/2.-Statistics/Coursera Week 4.pdf b/2.-Statistics/Coursera Week 4.pdf new file mode 100644 index 000000000..bc206d70d Binary files /dev/null and b/2.-Statistics/Coursera Week 4.pdf differ