From bdf48ab06b56cbecacf4ad7f417000530cf547ea Mon Sep 17 00:00:00 2001 From: Randell Dawson Date: Mon, 28 Sep 2020 18:18:41 -0700 Subject: [PATCH] initial commit --- .gitignore | 129 ----------------------------------------- README.md | 70 +++++++++++++++++++++- arithmetic_arranger.py | 4 ++ main.py | 10 ++++ test_module.py | 42 ++++++++++++++ 5 files changed, 125 insertions(+), 130 deletions(-) delete mode 100644 .gitignore create mode 100644 arithmetic_arranger.py create mode 100644 main.py create mode 100644 test_module.py diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b6e4761..0000000 --- a/.gitignore +++ /dev/null @@ -1,129 +0,0 @@ -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -# C extensions -*.so - -# Distribution / packaging -.Python -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ -pip-wheel-metadata/ -share/python-wheels/ -*.egg-info/ -.installed.cfg -*.egg -MANIFEST - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.nox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*.cover -*.py,cover -.hypothesis/ -.pytest_cache/ - -# Translations -*.mo -*.pot - -# Django stuff: -*.log -local_settings.py -db.sqlite3 -db.sqlite3-journal - -# Flask stuff: -instance/ -.webassets-cache - -# Scrapy stuff: -.scrapy - -# Sphinx documentation -docs/_build/ - -# PyBuilder -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# IPython -profile_default/ -ipython_config.py - -# pyenv -.python-version - -# pipenv -# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. -# However, in case of collaboration, if having platform-specific dependencies or dependencies -# having no cross-platform support, pipenv may install dependencies that don't work, or not -# install all needed dependencies. -#Pipfile.lock - -# PEP 582; used by e.g. github.com/David-OConnor/pyflow -__pypackages__/ - -# Celery stuff -celerybeat-schedule -celerybeat.pid - -# SageMath parsed files -*.sage.py - -# Environments -.env -.venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ - -# Spyder project settings -.spyderproject -.spyproject - -# Rope project settings -.ropeproject - -# mkdocs documentation -/site - -# mypy -.mypy_cache/ -.dmypy.json -dmypy.json - -# Pyre type checker -.pyre/ diff --git a/README.md b/README.md index a707005..8665e7b 100644 --- a/README.md +++ b/README.md @@ -1 +1,69 @@ -# arithmetic-formatter \ No newline at end of file +### Assignment + +Students in primary school often arrange arithmetic problems vertically to make them easier to solve. For example, "235 + 52" becomes: +``` + 235 ++ 52 +----- +``` + +Create a function that receives a list of strings that are arithmetic problems and returns the problems arranged vertically and side-by-side. The function should optionally take a second argument. When the second argument is set to `True`, the answers should be displayed. + +### For example + +Function Call: +```py +arithmetic_arranger(["32 + 698", "3801 - 2", "45 + 43", "123 + 49"]) +``` + +Output: +``` + 32 3801 45 123 ++ 698 - 2 + 43 + 49 +----- ------ ---- ----- +``` + +Function Call: +```py +arithmetic_arranger(["32 + 8", "1 - 3801", "9999 + 9999", "523 - 49"], True) +``` + +Output: +``` + 32 1 9999 523 ++ 8 - 3801 + 9999 - 49 +---- ------ ------ ----- + 40 -3800 19998 474 +``` + +### Rules + +The function will return the correct conversion if the supplied problems are properly formatted, otherwise, it will **return** a **string** that describes an error that is meaningful to the user. + + +* Situations that will return an error: + * If there are **too many problems** supplied to the function. The limit is **five**, anything more will return: + `Error: Too many problems.` + * The appropriate operators the function will accept are **addition** and **subtraction**. Multiplication and division will return an error. Other operators not mentioned in this bullet point will not need to be tested. The error returned will be: + `Error: Operator must be '+' or '-'.` + * Each number (operand) should only contain digits. Otherwise, the function will return: + `Error: Numbers must only contain digits.` + * Each operand (aka number on each side of the operator) has a max of four digits in width. Otherwise, the error string returned will be: + `Error: Numbers cannot be more than four digits.` +* If the user supplied the correct format of problems, the conversion you return will follow these rules: + * There should be a single space between the operator and the longest of the two operands, the operator will be on the same line as the second operand, both operands will be in the same order as provided (the first will be the top one and the second will be the bottom. + * Numbers should be right-aligned. + * There should be four spaces between each problem. + * There should be dashes at the bottom of each problem. The dashes should run along the entire length of each problem individually. (The example above shows what this should look like.) + +### Development + +Write your code in `arithmetic_arranger.py`. For development, you can use `main.py` to test your `arithmetic_arranger()` 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. diff --git a/arithmetic_arranger.py b/arithmetic_arranger.py new file mode 100644 index 0000000..0373ea4 --- /dev/null +++ b/arithmetic_arranger.py @@ -0,0 +1,4 @@ +def arithmetic_arranger(problems): + + + return arranged_problems \ No newline at end of file diff --git a/main.py b/main.py new file mode 100644 index 0000000..849c7d0 --- /dev/null +++ b/main.py @@ -0,0 +1,10 @@ +# This entrypoint file to be used in development. Start by reading README.md +from arithmetic_arranger import arithmetic_arranger +from unittest import main + + +print(arithmetic_arranger(["32 + 698", "3801 - 2", "45 + 43", "123 + 49"])) + + +# Run unit tests automatically +main(module='test_module', exit=False) \ No newline at end of file diff --git a/test_module.py b/test_module.py new file mode 100644 index 0000000..dee8129 --- /dev/null +++ b/test_module.py @@ -0,0 +1,42 @@ +import unittest +from arithmetic_arranger import arithmetic_arranger + + +# the test case +class UnitTests(unittest.TestCase): + def test_arrangement(self): + actual = arithmetic_arranger(["3 + 855", "3801 - 2", "45 + 43", "123 + 49"]) + expected = " 3 3801 45 123\n+ 855 - 2 + 43 + 49\n----- ------ ---- -----" + self.assertEqual(actual, expected, 'Expected different output when calling "arithmetic_arranger()" with ["3 + 855", "3801 - 2", "45 + 43", "123 + 49"]') + + actual = arithmetic_arranger(["11 + 4", "3801 - 2999", "1 + 2", "123 + 49", "1 - 9380"]) + expected = " 11 3801 1 123 1\n+ 4 - 2999 + 2 + 49 - 9380\n---- ------ --- ----- ------" + self.assertEqual(actual, expected, 'Expected different output when calling "arithmetic_arranger()" with ["11 + 4", "3801 - 2999", "1 + 2", "123 + 49", "1 - 9380"]') + + def test_too_many_problems(self): + actual = arithmetic_arranger(["44 + 815", "909 - 2", "45 + 43", "123 + 49", "888 + 40", "653 + 87"]) + expected = "Error: Too many problems." + self.assertEqual(actual, expected, 'Expected calling "arithmetic_arranger()" with more than five problems to return "Error: Too many problems."') + + def test_incorrect_operator(self): + actual = arithmetic_arranger(["3 / 855", "3801 - 2", "45 + 43", "123 + 49"]) + expected = "Error: Operator must be '+' or '-'." + self.assertEqual(actual, expected, '''Expected calling "arithmetic_arranger()" with a problem that uses the "/" operator to return "Error: Operator must be '+' or '-'."''') + + def test_too_many_digits(self): + actual = arithmetic_arranger(["24 + 85215", "3801 - 2", "45 + 43", "123 + 49"]) + expected = "Error: Numbers cannot be more than four digits." + self.assertEqual(actual, expected, 'Expected calling "arithmetic_arranger()" with a problem that has a number over 4 digits long to return "Error: Numbers cannot be more than four digits."') + + def test_only_digits(self): + actual = arithmetic_arranger(["98 + 3g5", "3801 - 2", "45 + 43", "123 + 49"]) + expected = "Error: Numbers must only contain digits." + self.assertEqual(actual, expected, 'Expected calling "arithmetic_arranger()" with a problem that contains a letter character in the number to return "Error: Numbers must only contain digits."') + + def test_solutions(self): + actual = arithmetic_arranger(["32 - 698", "1 - 3801", "45 + 43", "123 + 49"], True) + expected = " 32 1 45 123\n- 698 - 3801 + 43 + 49\n----- ------ ---- -----\n -666 -3800 88 172" + self.assertEqual(actual, expected, 'Expected solutions to be correctly displayed in output when calling "arithmetic_arranger()" with arithemetic problems and a second argument of `True`.') + +if __name__ == "__main__": + unittest.main() \ No newline at end of file