Merge pull request #11 from xing-zhixu/feature/add-power-modulo

feat: add power and modulo operations + input validation

Author: ThatSINEWAVE

Simple Calculator/simple-calculator.py

@@ -1,29 +1,42 @@
 def add(x, y):
     return x + y
 
-
 def subtract(x, y):
     return x - y
 
-
 def multiply(x, y):
     return x * y
 
-
 def divide(x, y):
     if y == 0:
         return "Cannot divide by zero!"
     return x / y
 
+def power(x, y):
+    return x ** y
+
+def modulo(x, y):
+    if y == 0:
+        return "Cannot mod by zero!"
+    return x % y
 
 def calculator():
     print("1. Add")
     print("2. Subtract")
     print("3. Multiply")
     print("4. Divide")
-    choice = int(input("Enter your choice (1/2/3/4): "))
-    num1 = float(input("Enter first number: "))
-    num2 = float(input("Enter second number: "))
+    print("5. Power")   
+    print("6. Modulo")  
+
+    
+    try:
+        choice = int(input("Enter your choice (1/2/3/4/5/6): "))
+        num1 = float(input("Enter first number: "))
+        num2 = float(input("Enter second number: "))
+    except ValueError:
+        print("Invalid input! Please enter numbers only.")
+        return
+
     if choice == 1:
         print("Result:", add(num1, num2))
     elif choice == 2:
@@ -32,8 +45,11 @@ def calculator():
         print("Result:", multiply(num1, num2))
     elif choice == 4:
         print("Result:", divide(num1, num2))
+    elif choice == 5:        
+        print("Result:", power(num1, num2))
+    elif choice == 6:  
+        print("Result:", modulo(num1, num2))
     else:
         print("Invalid choice!")
 
-
-calculator()
+calculator()