Memory

calculator.py

@@ -30,7 +30,6 @@ def add(self, a, b):
         :param b:
         :return:
         """
-        print( a + b)
         return a + b
 
 
@@ -41,7 +40,6 @@ def subtract(self, x, y):
         :param y:
         :return:
         """
-        print( x - y)
         return x - y
 
 
@@ -52,7 +50,6 @@ def multiply(self, x, y):
         :param y:
         :return:
         """
-        print( x * y)
         return y * x
 
 
@@ -79,7 +76,6 @@ def square(self, base):
         :param base:
         :return:
         """
-        print( base ** 2)
         return base ** 2
 
 
@@ -90,7 +86,6 @@ def exp(self, x, y):
         :param y:
         :return:
         """
-        print( x ** y)
         return x ** y
 
 
@@ -146,8 +141,10 @@ def cosine(self, x):
         :return:
         """
         if self.degrees:
-            x = math.radians(x)
-        return math.cos(x)
+            x = math.degrees(math.cos(x))
+        else:
+            x = math.cos(x)
+        return x
 
     def tangent(self, x):
         """
@@ -156,8 +153,10 @@ def tangent(self, x):
         :return:
         """
         if self.degrees:
-            x = math.radians(x)
-        return math.tan(x)
+            x = math.degrees(math.tan(x))
+        else:
+            x = math.tan(x)
+        return x
 
     def inverse_sine(self, x):
         """
@@ -166,8 +165,10 @@ def inverse_sine(self, x):
         :return:
         """
         if self.degrees:
-            x = math.radians(x)
-        return math.asin(x)
+            x = math.degrees(math.asin(x))
+        else:
+            x = math.asin(x)
+        return x
 
     def inverse_cosine(self, x):
         """
@@ -176,8 +177,10 @@ def inverse_cosine(self, x):
         :return:
         """
         if self.degrees:
-            x = math.radians(x)
-        return math.acos(x)
+            x = math.degrees(math.acos(x))
+        else:
+            x = math.acos(x)
+        return x
 
     def inverse_tangent(self, x):
         """
@@ -186,8 +189,10 @@ def inverse_tangent(self, x):
         :return:
         """
         if self.degrees:
-            x = math.radians(x)
-        return math.atan(x)
+            x = math.degrees(math.atan(x))
+        else:
+            x = math.atan(x)
+        return x
 
     ##SECONDARY FORMULAS
 

main_app.py

@@ -121,54 +121,54 @@ def screen_options():
     elif Operation == 10:
         print("Cosine")
         if calc.degrees:
-            print("Enter an angle in Radians to find Cosine: ")
+            print("Enter an angle in degrees to find Cosine: ")
         else:
-            print("Enter an angle in Degrees to find Cosine: ")
-            x = enter_num()
-            calc.result = calc.cosine(math.degrees(x))
-            return calc.result
+            print("Enter an angle in radians to find Cosine: ")
+        x = enter_num()
+        calc.result = calc.cosine(x)
+        return calc.result
 
 
     elif Operation == 11:
         print("Tangent")
         if calc.degrees:
-            print("Enter an angle in Radians to find Tangent: ")
+            print("Enter an angle in degrees to find Tangent: ")
         else:
-            print("Enter an angle in Degrees to find Tangent: ")
-            x = enter_num()
-            calc.result = calc.tangent(math.degrees(x))
-            return calc.result
+            print("Enter an angle in radians to find Tangent: ")
+        x = enter_num()
+        calc.result = calc.tangent(x)
+        return calc.result
 
 
     elif Operation == 12:
         print("Inverse Sine")
         if calc.degrees:
-            print("Enter an angle in Radians to find Inverse Sine: ")
+            print("Enter a number to find the arc sine in degrees: ")
         else:
-            print("Enter an angle in Degrees to find Inverse Sine: ")
-            x = enter_num()
-            result = calc.inverse_sine(math.degrees(x))
-            return result
+            print("Enter a number to find the arc sine in radians: ")
+        x = enter_num()
+        result = calc.inverse_sine(x)
+        return result
 
     elif Operation == 13:
         print("Inverse Cosine")
         if calc.degrees:
-            print("Enter an angle in Radians to find Inverse Cosine: ")
+            print("Enter an angle in degrees to find Inverse Cosine: ")
         else:
-            print("Enter an angle in Degrees to find Inverse Cosine: ")
-            x = enter_num()
-            calc.result = calc.inverse_cosine(math.degrees(x))
-            return calc.result
+            print("Enter an angle in radians to find Inverse Cosine: ")
+        x = enter_num()
+        calc.result = calc.inverse_cosine(x)
+        return calc.result
 
     elif Operation == 14:
         print("Inverse Tangent")
         if calc.degrees:
-            print("Enter an angle in Radians to find Inverse Tangent: ")
+            print("Enter an angle in degrees to find Inverse Tangent: ")
         else:
-            print("Enter an angle in Degrees to find Inverse Tangent: ")
-            x = enter_num()
-            calc.result = calc.inverse_tangent(math.degrees(x))
-            return calc.result
+            print("Enter an angle in radians to find Inverse Tangent: ")
+        x = enter_num()
+        calc.result = calc.inverse_tangent(x)
+        return calc.result
 
 ##MEMORY FUNCTIONS