From 80352db2ee5d976903a912d86bf475191349d492 Mon Sep 17 00:00:00 2001
From: chm <3227492039@qq.com>
Date: Thu, 10 Oct 2024 17:17:08 +0800
Subject: [PATCH] 1

---
 Calculator.java | 44 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/Calculator.java b/Calculator.java
index e647c9b..af20010 100644
--- a/Calculator.java
+++ b/Calculator.java
@@ -1,3 +1,5 @@
+import java.util.Scanner;
+
 public class Calculator {
 
     // 加法
@@ -28,17 +30,43 @@ public class Calculator {
         return a % b;
     }
 
-    // 主函数，用于测试计算器
     public static void main(String[] args) {
+        Scanner scanner = new Scanner(System.in);
         Calculator calc = new Calculator();
 
-        double num1 = 10;
-        double num2 = 5;
+        System.out.println("Enter first number:");
+        double num1 = scanner.nextDouble();
+
+        System.out.println("Enter second number:");
+        double num2 = scanner.nextDouble();
+
+        System.out.println("Choose operation (+, -, *, /, %):");
+        char operation = scanner.next().charAt(0);
+
+        double result;
+        switch (operation) {
+            case '+':
+                result = calc.add(num1, num2);
+                break;
+            case '-':
+                result = calc.subtract(num1, num2);
+                break;
+            case '*':
+                result = calc.multiply(num1, num2);
+                break;
+            case '/':
+                result = calc.divide(num1, num2);
+                break;
+            case '%':
+                result = calc.remainder(num1, num2);
+                break;
+            default:
+                System.out.println("Invalid operation");
+                scanner.close();
+                return;
+        }
 
-        System.out.println("Add: " + calc.add(num1, num2));
-        System.out.println("Subtract: " + calc.subtract(num1, num2));
-        System.out.println("Multiply: " + calc.multiply(num1, num2));
-        System.out.println("Divide: " + calc.divide(num1, num2));
-        System.out.println("Remainder: " + calc.remainder(num1, num2));
+        System.out.println("Result: " + result);
+        scanner.close();
     }
 }
\ No newline at end of file