diff --git a/curriculum/challenges/english/07-scientific-computing-with-python/scientific-computing-with-python-projects/polygon-area-calculator.md b/curriculum/challenges/english/07-scientific-computing-with-python/scientific-computing-with-python-projects/polygon-area-calculator.md index 8c7067f044..0e4867ed29 100644 --- a/curriculum/challenges/english/07-scientific-computing-with-python/scientific-computing-with-python-projects/polygon-area-calculator.md +++ b/curriculum/challenges/english/07-scientific-computing-with-python/scientific-computing-with-python-projects/polygon-area-calculator.md @@ -8,22 +8,96 @@ dashedName: polygon-area-calculator # --description-- -In this project you will use object oriented programming to create a Rectangle class and a Square class. The Square class should be a subclass of Rectangle and inherit methods and attributes. - -You can access [the full project description and starter code on Replit](https://replit.com/github/freeCodeCamp/boilerplate-polygon-area-calculator). - -After going to that link, fork the project. Once you complete the project based on the instructions in 'README.md', submit your project link below. +You will be [working on this project with our Replit starter code](https://replit.com/github/freeCodeCamp/boilerplate-polygon-area-calculator). We are still developing the interactive instructional part of the Python curriculum. For now, here are some videos on the freeCodeCamp.org YouTube channel that will teach you everything you need to know to complete this project: - +- [Python for Everybody Video Course](https://www.freecodecamp.org/news/python-for-everybody/) (14 hours) + +- [Learn Python Video Course](https://www.freecodecamp.org/news/learn-python-video-course/) (10 hours) + +# --instructions-- + +In this project you will use object oriented programming to create a Rectangle class and a Square class. The Square class should be a subclass of Rectangle and inherit methods and attributes. + +## Rectangle class + +When a Rectangle object is created, it should be initialized with `width` and `height` attributes. The class should also contain the following methods: + +- `set_width` +- `set_height` +- `get_area`: Returns area (`width * height`) +- `get_perimeter`: Returns perimeter (`2 * width + 2 * height`) +- `get_diagonal`: Returns diagonal (`(width ** 2 + height ** 2) ** .5`) +- `get_picture`: Returns a string that represents the shape using lines of "\*". The number of lines should be equal to the height and the number of "\*" in each line should be equal to the width. There should be a new line (`\n`) at the end of each line. If the width or height is larger than 50, this should return the string: "Too big for picture.". +- `get_amount_inside`: Takes another shape (square or rectangle) as an argument. Returns the number of times the passed in shape could fit inside the shape (with no rotations). For instance, a rectangle with a width of 4 and a height of 8 could fit in two squares with sides of 4. + +Additionally, if an instance of a Rectangle is represented as a string, it should look like: `Rectangle(width=5, height=10)` + +## Square class + +The Square class should be a subclass of Rectangle. When a Square object is created, a single side length is passed in. The `__init__` method should store the side length in both the `width` and `height` attributes from the Rectangle class. + +The Square class should be able to access the Rectangle class methods but should also contain a `set_side` method. If an instance of a Square is represented as a string, it should look like: `Square(side=9)` + +Additionally, the `set_width` and `set_height` methods on the Square class should set both the width and height. + +## Usage example + +```py +rect = shape_calculator.Rectangle(10, 5) +print(rect.get_area()) +rect.set_height(3) +print(rect.get_perimeter()) +print(rect) +print(rect.get_picture()) + +sq = shape_calculator.Square(9) +print(sq.get_area()) +sq.set_side(4) +print(sq.get_diagonal()) +print(sq) +print(sq.get_picture()) + +rect.set_height(8) +rect.set_width(16) +print(rect.get_amount_inside(sq)) +``` + +That code should return: + +```bash +50 +26 +Rectangle(width=10, height=3) +********** +********** +********** + +81 +5.656854249492381 +Square(side=4) +**** +**** +**** +**** + +8 +``` + +The unit tests for this project are in `test_module.py`. + +## Development + +Write your code in `shape_calculator.py`. For development, you can use `main.py` to test your `shape_calculator()` function. Click the "run" button and `main.py` will run. + +## Testing + +We imported the tests from `test_module.py` to `main.py` for your convenience. The tests will run automatically whenever you hit the "run" button. + +## Submitting + +Copy your project's URL and submit it to freeCodeCamp. # --hints-- diff --git a/curriculum/challenges/english/07-scientific-computing-with-python/scientific-computing-with-python-projects/probability-calculator.md b/curriculum/challenges/english/07-scientific-computing-with-python/scientific-computing-with-python-projects/probability-calculator.md index b89b308ffd..263ad72431 100644 --- a/curriculum/challenges/english/07-scientific-computing-with-python/scientific-computing-with-python-projects/probability-calculator.md +++ b/curriculum/challenges/english/07-scientific-computing-with-python/scientific-computing-with-python-projects/probability-calculator.md @@ -8,20 +8,70 @@ dashedName: probability-calculator # --description-- -Write a program to determine the approximate probability of drawing certain balls randomly from a hat. - -You can access [the full project description and starter code on Replit](https://replit.com/github/freeCodeCamp/boilerplate-probability-calculator). After going to that link, fork the project. Once you complete the project based on the instructions in 'README.md', submit your project link below. +You will be [working on this project with our Replit starter code](https://replit.com/github/freeCodeCamp/boilerplate-probability-calculator). We are still developing the interactive instructional part of the Python curriculum. For now, here are some videos on the freeCodeCamp.org YouTube channel that will teach you everything you need to know to complete this project: - +- [Python for Everybody Video Course](https://www.freecodecamp.org/news/python-for-everybody/) (14 hours) + +- [Learn Python Video Course](https://www.freecodecamp.org/news/learn-python-video-course/) (10 hours) + +# --instructions-- + +Suppose there is a hat containing 5 blue balls, 4 red balls, and 2 green balls. What is the probability that a random draw of 4 balls will contain at least 1 red ball and 2 green balls? While it would be possible to calculate the probability using advanced mathematics, an easier way is to write a program to perform a large number of experiments to estimate an approximate probability. + +For this project, you will write a program to determine the approximate probability of drawing certain balls randomly from a hat. + +First, create a `Hat` class in `prob_calculator.py`. The class should take a variable number of arguments that specify the number of balls of each color that are in the hat. For example, a class object could be created in any of these ways: + +```py +hat1 = Hat(yellow=3, blue=2, green=6) +hat2 = Hat(red=5, orange=4) +hat3 = Hat(red=5, orange=4, black=1, blue=0, pink=2, striped=9) +``` + +A hat will always be created with at least one ball. The arguments passed into the hat object upon creation should be converted to a `contents` instance variable. `contents` should be a list of strings containing one item for each ball in the hat. Each item in the list should be a color name representing a single ball of that color. For example, if your hat is `{"red": 2, "blue": 1}`, `contents` should be `["red", "red", "blue"]`. + +The `Hat` class should have a `draw` method that accepts an argument indicating the number of balls to draw from the hat. This method should remove balls at random from `contents` and return those balls as a list of strings. The balls should not go back into the hat during the draw, similar to an urn experiment without replacement. If the number of balls to draw exceeds the available quantity, return all the balls. + +Next, create an `experiment` function in `prob_calculator.py` (not inside the `Hat` class). This function should accept the following arguments: + +- `hat`: A hat object containing balls that should be copied inside the function. +- `expected_balls`: An object indicating the exact group of balls to attempt to draw from the hat for the experiment. For example, to determine the probability of drawing 2 blue balls and 1 red ball from the hat, set `expected_balls` to `{"blue":2, "red":1}`. +- `num_balls_drawn`: The number of balls to draw out of the hat in each experiment. +- `num_experiments`: The number of experiments to perform. (The more experiments performed, the more accurate the approximate probability will be.) + +The `experiment` function should return a probability. + +For example, let's say that you want to determine the probability of getting at least 2 red balls and 1 green ball when you draw 5 balls from a hat containing 6 black, 4 red, and 3 green. To do this, we perform `N` experiments, count how many times `M` we get at least 2 red balls and 1 green ball, and estimate the probability as `M/N`. Each experiment consists of starting with a hat containing the specified balls, drawing a number of balls, and checking if we got the balls we were attempting to draw. + +Here is how you would call the `experiment` function based on the example above with 2000 experiments: + +```py +hat = Hat(black=6, red=4, green=3) +probability = experiment(hat=hat, + expected_balls={"red":2,"green":1}, + num_balls_drawn=5, + num_experiments=2000) +``` + +Since this is based on random draws, the probability will be slightly different each time the code is run. + +*Hint: Consider using the modules that are already imported at the top of `prob_calculator.py`. Do not initialize random seed within `prob_calculator.py`.* + +## Development + +Write your code in `prob_calculator.py`. For development, you can use `main.py` to test your code. Click the "run" button and `main.py` will run. + +The boilerplate includes `import` statements for the `copy` and `random` modules. Consider using those in your project. + +## Testing + +The unit tests for this project are in `test_module.py`. We imported the tests from `test_module.py` to `main.py` for your convenience. The tests will run automatically whenever you hit the "run" button. + +## Submitting + +Copy your project's URL and submit it to freeCodeCamp. # --hints-- diff --git a/curriculum/challenges/english/07-scientific-computing-with-python/scientific-computing-with-python-projects/time-calculator.md b/curriculum/challenges/english/07-scientific-computing-with-python/scientific-computing-with-python-projects/time-calculator.md index 1f6e988b81..f1143e4ba5 100644 --- a/curriculum/challenges/english/07-scientific-computing-with-python/scientific-computing-with-python-projects/time-calculator.md +++ b/curriculum/challenges/english/07-scientific-computing-with-python/scientific-computing-with-python-projects/time-calculator.md @@ -8,20 +8,63 @@ dashedName: time-calculator # --description-- -Write a function named "add_time" that can add a duration to a start time and return the result. - -You can access [the full project description and starter code on Replit](https://replit.com/github/freeCodeCamp/boilerplate-time-calculator). After going to that link, fork the project. Once you complete the project based on the instructions in 'README.md', submit your project link below. +You will be [working on this project with our Replit starter code](https://replit.com/github/freeCodeCamp/boilerplate-time-calculator). We are still developing the interactive instructional part of the Python curriculum. For now, here are some videos on the freeCodeCamp.org YouTube channel that will teach you everything you need to know to complete this project: - +- [Python for Everybody Video Course](https://www.freecodecamp.org/news/python-for-everybody/) (14 hours) + +- [Learn Python Video Course](https://www.freecodecamp.org/news/learn-python-video-course/) (10 hours) + +# --instructions-- + +Write a function named `add_time` that takes in two required parameters and one optional parameter: + +- a start time in the 12-hour clock format (ending in AM or PM) +- a duration time that indicates the number of hours and minutes +- (optional) a starting day of the week, case insensitive + +The function should add the duration time to the start time and return the result. + +If the result will be the next day, it should show `(next day)` after the time. If the result will be more than one day later, it should show `(n days later)` after the time, where "n" is the number of days later. + +If the function is given the optional starting day of the week parameter, then the output should display the day of the week of the result. The day of the week in the output should appear after the time and before the number of days later. + +Below are some examples of different cases the function should handle. Pay close attention to the spacing and punctuation of the results. + +```py +add_time("3:00 PM", "3:10") +# Returns: 6:10 PM + +add_time("11:30 AM", "2:32", "Monday") +# Returns: 2:02 PM, Monday + +add_time("11:43 AM", "00:20") +# Returns: 12:03 PM + +add_time("10:10 PM", "3:30") +# Returns: 1:40 AM (next day) + +add_time("11:43 PM", "24:20", "tueSday") +# Returns: 12:03 AM, Thursday (2 days later) + +add_time("6:30 PM", "205:12") +# Returns: 7:42 AM (9 days later) +``` + +Do not import any Python libraries. Assume that the start times are valid times. The minutes in the duration time will be a whole number less than 60, but the hour can be any whole number. + +## Development + +Write your code in `time_calculator.py`. For development, you can use `main.py` to test your `time_calculator()` function. Click the "run" button and `main.py` will run. + +## Testing + +The unit tests for this project are in `test_module.py`. We imported the tests from `test_module.py` to `main.py` for your convenience. The tests will run automatically whenever you hit the "run" button. + +## Submitting + +Copy your project's URL and submit it to freeCodeCamp. # --hints--