Open
Conversation
Add addition func
Add substraction func
Add multiplication func
Add division func
Fixed image display
Beautify calculator and Update README.md
albidgy
reviewed
Sep 20, 2023
albidgy
left a comment
albidgy
left a comment
There was a problem hiding this comment.
Отличная работа!
- README понятный, приведены примеры. Только лучше писать README на английском языке.
- Комментарии к коммитам отличные.
- Хорошие, осознанные названия переменных и функций.
- Здорово, что сделали реализацию с while.
Баллы:
За каждую функцию: 1.6 * 5 = 8 баллов
За README 1 + 1 доп. = 2 балла
За наличие всех форков и пулл-реквестов - 1 балл
Дополнительные баллы за pattern matching - 0.2 и 0.1 за while = 0.3 балла.
Итого: 11.3 балла
| @@ -0,0 +1,35 @@ | |||
| def addition(a, b): | |||
| return(a + b) | |||
There was a problem hiding this comment.
скобки у return не нужны
Suggested change
| return(a + b) | |
| return a + b |
| @@ -0,0 +1,35 @@ | |||
| def addition(a, b): | |||
| return(a + b) | |||
|
|
|||
There was a problem hiding this comment.
По PEP8 после функции делают 2 пропуска строки
| return(a + b) | ||
|
|
||
| def subtraction(a, b): | ||
| return(a - b) |
There was a problem hiding this comment.
Suggested change
| return(a - b) | |
| return a - b |
| return(a - b) | ||
|
|
||
| def multiplication(a, b): | ||
| return(a * b) |
There was a problem hiding this comment.
Suggested change
| return(a * b) | |
| return a * b |
| return(a * b) | ||
|
|
||
| def division(a, b): | ||
| return(a / b) |
There was a problem hiding this comment.
Suggested change
| return(a / b) | |
| return a / b |
Comment on lines
+19
to
+22
| calculator_func_dict = {'-': subtraction, | ||
| '*': multiplication, | ||
| '+': addition, | ||
| '/': division} |
|
|
||
| calc_string = input('Enter your expression: ') | ||
|
|
||
| while calc_string != 'exit': |
There was a problem hiding this comment.
Здорово, что сделали возможность проводить столько вычислений, сколько нужно пользователю👍
| calc_string = input('Enter your expression: ') | ||
|
|
||
| while calc_string != 'exit': | ||
| command = calc_parser(calc_string)[1] |
There was a problem hiding this comment.
Можно один раз вызвать функцию calc_parser() и потом разом записать в переменные элементы в список, а не трижды ее вызывать. Так работает, но выглядит неоптимально.
Например:
Suggested change
| command = calc_parser(calc_string)[1] | |
| numb1, command, numb2 = calc_parser(calc_string) |
Comment on lines
+24
to
+35
| calc_string = input('Enter your expression: ') | ||
|
|
||
| while calc_string != 'exit': | ||
| command = calc_parser(calc_string)[1] | ||
| if command in calculator_func_dict: | ||
| print(calculator_func_dict[command](calc_parser(calc_string)[0], calc_parser(calc_string)[2])) | ||
| else: | ||
| print('Seems like an invalid expression. Please, enter valid expression!') | ||
|
|
||
| calc_string = input('Enter your expression: ') | ||
|
|
||
| print('See you next time!') |
There was a problem hiding this comment.
Этот код тоже можно было обернуть в функцию
Suggested change
| calc_string = input('Enter your expression: ') | |
| while calc_string != 'exit': | |
| command = calc_parser(calc_string)[1] | |
| if command in calculator_func_dict: | |
| print(calculator_func_dict[command](calc_parser(calc_string)[0], calc_parser(calc_string)[2])) | |
| else: | |
| print('Seems like an invalid expression. Please, enter valid expression!') | |
| calc_string = input('Enter your expression: ') | |
| print('See you next time!') | |
| def main(): | |
| calc_string = input('Enter your expression: ') | |
| while calc_string != 'exit': | |
| command = calc_parser(calc_string)[1] | |
| if command in calculator_func_dict: | |
| print(calculator_func_dict[command](calc_parser(calc_string)[0], calc_parser(calc_string)[2])) | |
| else: | |
| print('Seems like an invalid expression. Please, enter valid expression!') | |
| calc_string = input('Enter your expression: ') | |
| print('See you next time!') | |
| main() | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Team HW2 on python BI 2023/2024