From 846e1ebf33c2d430a33c3cb559c9c3e3f3b75c27 Mon Sep 17 00:00:00 2001 From: AndriiVyshnevskyi <125596048+AndriiVyshnevskyi@users.noreply.github.com> Date: Mon, 3 Jul 2023 10:12:00 +0300 Subject: [PATCH 1/2] Create Calculator --- Calculator | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 Calculator diff --git a/Calculator b/Calculator new file mode 100644 index 0000000..770bd5c --- /dev/null +++ b/Calculator @@ -0,0 +1,29 @@ +def calculator(): + print("Простой калькулятор") + print("Выберите операцию:") + print("1. Сложение") + print("2. Вычитание") + print("3. Умножение") + print("4. Деление") + + choice = input("Введите номер операции (1/2/3/4): ") + + num1 = float(input("Введите первое число: ")) + num2 = float(input("Введите второе число: ")) + + result = 0 + + if choice == '1': + result = num1 + num2 + elif choice == '2': + result = num1 - num2 + elif choice == '3': + result = num1 * num2 + elif choice == '4': + result = num1 / num2 + else: + print("Неверный ввод") + + print("Результат: " + str(result)) + +calculator() From 8efcea5b0058d9f0619be96e631f98522c1888c7 Mon Sep 17 00:00:00 2001 From: AndriiVyshnevskyi <125596048+AndriiVyshnevskyi@users.noreply.github.com> Date: Mon, 3 Jul 2023 10:55:46 +0300 Subject: [PATCH 2/2] Update Calculator --- Calculator | 57 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/Calculator b/Calculator index 770bd5c..3d25d87 100644 --- a/Calculator +++ b/Calculator @@ -1,29 +1,40 @@ -def calculator(): - print("Простой калькулятор") - print("Выберите операцию:") - print("1. Сложение") - print("2. Вычитание") - print("3. Умножение") - print("4. Деление") +def add(x, y): + """Addition""" + return x + y - choice = input("Введите номер операции (1/2/3/4): ") +def subtract(x, y): + """Subtraction""" + return x - y - num1 = float(input("Введите первое число: ")) - num2 = float(input("Введите второе число: ")) +def multiply(x, y): + """multiplication""" + return x * y - result = 0 - - if choice == '1': - result = num1 + num2 - elif choice == '2': - result = num1 - num2 - elif choice == '3': - result = num1 * num2 - elif choice == '4': - result = num1 / num2 +def divide(x, y): + """Division""" + if y != 0: + return x / y else: - print("Неверный ввод") + return "Error, divide -0-!" + +print("Choose transaction:") +print("1. Addition") +print("2. Subtraction") +print("3. multiplication") +print("4. Division") + +choice = input("Add number operation (1/2/3/4): ") - print("Результат: " + str(result)) +num1 = float(input("Enter first number: ")) +num2 = float(input("Enter second number: ")) -calculator() +if choice == '1': + print(num1, "+", num2, "=", add(num1, num2)) +elif choice == '2': + print(num1, "-", num2, "=", subtract(num1, num2)) +elif choice == '3': + print(num1, "*", num2, "=", multiply(num1, num2)) +elif choice == '4': + print(num1, "/", num2, "=", divide(num1, num2)) +else: + print("Incorrect input transaction")