Merge pull request steam-bell-92#540 from Tech4Aditya/main

Enhance calculator with history tracking and input updates

Author: steam-bell-92

math/Simple-Calculator/Simple-Calculator.py

@@ -1,10 +1,8 @@
 import math
 
-from matplotlib.pylab import angle
-
 class Calculator:
     def __init__(self):
-        pass 
+        self.history = []
 
     def start_calculation(self):
         print("--------Menu---------")
@@ -23,11 +21,13 @@ def start_calculation(self):
         print('13. Cotangent')
         print('14. Secant')
         print('15. Cosecant')
-        print('16. Exit')
+        print('16. View History')
+        print('17. Exit')
 
         while True:
             try:
-                user_input = int(input('Enter your choice to calculate(1-16): '))
+                user_input = int(input('Enter your choice to calculate(1-17): '))
+
                 if user_input == 1:
                     self.addition()
                 elif user_input == 2:
@@ -59,13 +59,15 @@ def start_calculation(self):
                 elif user_input == 15:
                     self.cosecant()
                 elif user_input == 16:
+                    self.show_history()
+                elif user_input == 17:
                     print('Goodbye! Have a good day.')
                     break
                 else:
                     print('Wrong Choice.')
 
             except ValueError:
-                print('please enter correct option.')
+                print('Please enter correct option.')
             except ZeroDivisionError:
                 print('Zero cannot be divided by zero.')
             except Exception as e:
@@ -76,108 +78,137 @@ def clean(self, x, eps=1e-10):
             return 0.0
         return x
 
+    def add_history(self, operation):
+        self.history.append(operation)
+
+    def show_history(self):
+        if not self.history:
+            print("No calculations yet.")
+        else:
+            print("\n------ Calculation History ------")
+            for item in self.history:
+                print(item)
 
     def addition(self):
-        a = int(input('enter first value: '))
-        b = int(input('enter second value: '))
+        a = float(input('Enter first value: '))
+        b = float(input('Enter second value: '))
         add = a + b
         print(f'The Result is: {add}')
-    
+        self.add_history(f"{a} + {b} = {add}")
+
     def substraction(self):
-        a = int(input('enter first value: '))
-        b = int(input('enter second value: '))
+        a = float(input('Enter first value: '))
+        b = float(input('Enter second value: '))
         minus = a - b
         print(f'The Result is: {minus}')
+        self.add_history(f"{a} - {b} = {minus}")
 
-    def division(self):
-        a = int(input('enter first value: '))
-        b = int(input('enter second value: '))
-        div = a / b
-        print(f'The Result is: {div}')
-    
     def multiplication(self):
-        a = int(input('enter first value: '))
-        b = int(input('enter second value: '))
+        a = float(input('Enter first value: '))
+        b = float(input('Enter second value: '))
         multiplication = a * b
         print(f'The Result is: {multiplication}')
+        self.add_history(f"{a} * {b} = {multiplication}")
+
+    def division(self):
+        a = float(input('Enter first value: '))
+        b = float(input('Enter second value: '))
+        div = a / b
+        print(f'The Result is: {div}')
+        self.add_history(f"{a} / {b} = {div}")
 
     def floor_division(self):
-        a = int(input('enter first value: '))
-        b = int(input('enter second value: '))
+        a = float(input('Enter first value: '))
+        b = float(input('Enter second value: '))
         floor = a // b
         print(f'The Result is: {floor}')
+        self.add_history(f"{a} // {b} = {floor}")
 
     def modulus(self):
-        a = int(input('enter first value: '))
-        b = int(input('enter second value: '))
+        a = float(input('Enter first value: '))
+        b = float(input('Enter second value: '))
         mod = a % b
         print(f'The Result is: {mod}')
+        self.add_history(f"{a} % {b} = {mod}")
 
     def power(self):
-        a = int(input('enter first value: '))
-        b = int(input('enter second value: '))
+        a = float(input('Enter first value: '))
+        b = float(input('Enter second value: '))
         power = a ** b
         print(f'The Result is: {power}')
+        self.add_history(f"{a} ** {b} = {power}")
 
     def factorial(self):
         a = int(input("Enter the number: "))
         fact = 1
-        for i in range(1,a+1):
-            fact = fact * i
+        for i in range(1, a + 1):
+            fact *= i
         print(f"Factorial is: {fact}")
-    
+        self.add_history(f"{a}! = {fact}")
+
     def sqrt(self):
-        num = int(input("Enter the number: "))
+        num = float(input("Enter the number: "))
         sqrt = num ** 0.5
-        print(f"Square root of {num} : {sqrt}")
+        print(f"Square root of {num}: {sqrt}")
+        self.add_history(f"sqrt({num}) = {sqrt}")
 
     def sine(self):
         angle = float(input("Enter the angle in degrees: "))
         rads = math.radians(angle)
         sin_val = self.clean(math.sin(rads))
         print(f"Sine of {angle} degrees is: {sin_val}")
+        self.add_history(f"sin({angle}) = {sin_val}")
 
     def cosine(self):
         angle = float(input("Enter the angle in degrees: "))
         rads = math.radians(angle)
         cos_val = self.clean(math.cos(rads))
         print(f"Cosine of {angle} degrees is: {cos_val}")
+        self.add_history(f"cos({angle}) = {cos_val}")
 
     def tangent(self):
         angle = float(input("Enter the angle in degrees: "))
         rads = math.radians(angle)
         tan_val = self.clean(math.tan(rads))
         print(f"Tangent of {angle} degrees is: {tan_val}")
+        self.add_history(f"tan({angle}) = {tan_val}")
 
     def cotangent(self):
         angle = float(input("Enter the angle in degrees: "))
         rads = math.radians(angle)
         tan_val = self.clean(math.tan(rads))
+
         if tan_val != 0:
             cot_val = 1 / tan_val
             print(f"Cotangent of {angle} degrees is: {cot_val}")
+            self.add_history(f"cot({angle}) = {cot_val}")
         else:
-            print(f"Cotangent of {angle} degrees is undefined.")
+            print("Cotangent is undefined.")
 
     def secant(self):
         angle = float(input("Enter the angle in degrees: "))
         rads = math.radians(angle)
         cos_val = self.clean(math.cos(rads))
+
         if cos_val != 0:
             sec_val = 1 / cos_val
             print(f"Secant of {angle} degrees is: {sec_val}")
+            self.add_history(f"sec({angle}) = {sec_val}")
         else:
-            print(f"Secant of {angle} degrees is undefined.")
+            print("Secant is undefined.")
 
     def cosecant(self):
         angle = float(input("Enter the angle in degrees: "))
         rads = math.radians(angle)
         sin_val = self.clean(math.sin(rads))
+
         if sin_val != 0:
             csc_val = 1 / sin_val
             print(f"Cosecant of {angle} degrees is: {csc_val}")
+            self.add_history(f"csc({angle}) = {csc_val}")
         else:
-            print(f"Cosecant of {angle} degrees is undefined.")
+            print("Cosecant is undefined.")
+
 
 cal = Calculator()
 cal.start_calculation()