1

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;
+        System.out.println("Enter first number:");
-        double num2 = 5;
+        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("Result: " + result);
-        System.out.println("Subtract: " + calc.subtract(num1, num2));
+        scanner.close();
-        System.out.println("Multiply: " + calc.multiply(num1, num2));
-        System.out.println("Divide: " + calc.divide(num1, num2));
-        System.out.println("Remainder: " + calc.remainder(num1, num2));
     }
 }