Merge final

buttons.md

@@ -0,0 +1,54 @@
+#list of calculator buttons and function definitions
+##Core
+`state` <- represents the screen
+
+`get current number on display`
+
+`clear the display`
+
+`add`
+add(a: float, b:float) -> float
+
+`sub`
+sub(a: float, b:float) -> float
+
+`multiply`
+
+`divide`
+
+`squre`
+
+`square_root`
+
+`exponentiate`
+
+`inverse` 
+
+`invert_sign`
+
+##scientific
+###Display
+`switch_display_rotate`
+`switch_display_str`
+`display_binary`
+`display_octal`
+`display_decimal`
+`display_hex`
+###memmory
+* store 1 value (for recall)
+
+`m+` (puts display in memory)
+`mc` (clears memory)
+`mrc` (puts memory on screen)
+
+###trig
+`sin`
+`cos`
+`tan`
+`asin` (inverse)
+`acos`
+`atan`
+###switch trig mode
+rads and degrees
+rads_degrees_swap() -> str
+switch and string

calc.py

@@ -0,0 +1,25 @@
+from calculator import State
+
+state = State()
+
+while True:
+    state.print()
+    if state.command is None:
+        print("current command is:", state.command)
+    state.user_entry = input("please enter a mathematical function or number (or type help): ")
+    if state.user_entry.isnumeric():
+        state.user_entry = float(state.user_entry)
+        if state.command is None:
+            state.value = state.user_entry
+        elif state.command == "+":
+            state.add(state.user_entry)
+        elif state.command == "-":
+            state.sub(state.user_entry)
+    elif state.user_entry.upper() == "HELP":
+        state.help()
+        continue
+    elif state.user_entry.upper() == "EXIT":
+        break
+    else:
+        state.command = state.user_entry.upper()
+print("thanks for pushing all my buttons")

calculator.py

@@ -1,12 +1,267 @@
+
+import math
+
 class Calculator:
 
     def __init__(self):
-        pass
 
-    def add(self, x, y):
-        return x + y
+        self.error = False
+        self.result = 0
+        self.degrees = True
+        self.display_mode = "decimal"
+        self.stored_number = 0
+        self.exit = False
+
+    def err(self):
+        self.error = True
+
+    def eval_function(self, x: str):
+        """
+        evaluates x to return a result
+        """
+        try:
+            result = eval(x)
+            return result
+        except:
+            self.err()
+            return "Err"
+
+
+
+    def add(self, a, b):
+        """
+        ADDS TWO NUMBERS AND RETURNS RESULT
+        :param a:
+        :param b:
+        :return:
+        """
+        return a + b
+
+
+    def subtract(self, x, y):
+        """
+        SUBTRACTS TWO NUMBERS AND RETURNS RESULT
+        :param x:
+        :param y:
+        :return:
+        """
+        return x - y
+
+
+    def multiply(self, x, y):
+        """
+        MULTIPLIES TWO NUMBERS AND RETURNS RESULT
+        :param x:
+        :param y:
+        :return:
+        """
+        return y * x
+
+
+    def divide(self, x, y):
+
+        """
+        DIVIDES TWO NUMBERS AND RETURNS RESULT
+        :param x:
+        :param y:
+        :return:
+        """
+        try:
+            result = x / y
+        except:
+            result = "Err"
+            self.err()
+            return result
+
+        return result
+
+
+    def square(self, base):
+        """
+        SQUARES A NUMBER AND RETURNS RESULT
+        :param base:
+        :return:
+        """
+        return base ** 2
+
+
+    def exp(self, x, y):
+        """
+        EXPONENTIATES TWO NUMBERS AND RETURNS RESULT
+        :param x:
+        :param y:
+        :return:
+        """
+        return x ** y
+
+
+    def square_root(self, x):
+        """
+        FINDS THE SQUARE ROOT OF A NUMBER AND RETURNS RESULT
+        :param x:
+        :return:
+        """
+        try:
+            print(math.sqrt(x))
+        except:
+            self.err()
+            return "Err"
+        return math.sqrt(x)
+
+
+    def invert(self, x):
+        """
+        INVERSES A NUMBER AND RETURNS RESULT
+        :param x:
+        :return:
+        """
+        try:
+            result = 1/x
+            return result
+        except:
+            self.err()
+            return "Err"
+
+
+    def deg_rad_swap(self):
+        """
+        SWAPS BETWEEN RADIANS AND DEGREES
+        :return:
+        """
+        self.degrees = not self.degrees
+
+    def sin(self, x):
+        """
+        FINDS SINE OF NUMBER AND RETURNS RESULT
+        :param x:
+        :return:
+        """
+        try:
+            if self.degrees:
+                x = math.radians(x)
+            return math.sin(x)
+        except:
+            return "Err"
+
+    def cosine(self, x):
+        """
+        FINDS COSINE OF NUMBER AND RETURNS RESULT
+        :param x:
+        :return:
+        """
+        try:
+            if self.degrees:
+                x = math.radians(x)
+            x = math.cos(x)
+            return x
+        except:
+            return "Err"
+
+    def tangent(self, x):
+        """
+        FINDS TANGENT OF NUMBER AND RETURNS RESULT
+        :param x:
+        :return:
+        """
+        try:
+            if self.degrees:
+                x = math.radians(x)
+            x = math.tan(x)
+            return x
+        except:
+            return "Err"
+
+    def inverse_sine(self, x):
+        """
+        FINDS INVERSE SINE OF NUMBER AND RETURNS RESULT
+        :param x:
+        :return:
+        """
+        try:
+            if self.degrees:
+                x = math.degrees(math.asin(x))
+            else:
+                x = math.asin(x)
+            return x
+        except:
+            return "Err"
+
+    def inverse_cosine(self, x):
+        """
+        FINDS INVERSE COSINE OF NUMBER AND RETURNS RESULT
+        :param x:
+        :return:
+        """
+        try:
+            if self.degrees:
+                x = math.degrees(math.acos(x))
+            else:
+                x = math.acos(x)
+            return x
+        except:
+            return "Err"
+
+    def inverse_tangent(self, x):
+        """
+        FINDS INVERSE TANGENT OF NUMBER AND RETURNS RESULT
+        :param x:
+        :return:
+        """
+        try:
+            if self.degrees:
+                x = math.degrees(math.atan(x))
+            else:
+                x = math.atan(x)
+            return x
+        except:
+            return "Err"
+
+    ##SECONDARY FORMULAS
+
+    def add2(self, x):
+        """
+        ADDS A NUMBER WITH THE SAME NUMBER
+        :param x:
+        :return:
+        """
+        print(self.result + x)
+        return self.result + x
+
+
+    def subtract2(self, x):
+        """
+        SUBTRACTS A NUMBER WITH THE SAME NUMBER
+        :param x:
+        :return:
+        """
+        print(self.result - x)
+        return self.result - x
+
+
+    def multiply2(self, x):
+        """
+        MULTIPLIES A NUMBER WITH THE SAME NUMBER
+        :param x:
+        :return:
+        """
+        # print( self.result * x)
+        return self.result * x
+
+
+    def divide2(self, x):
+        """
+        DIVIDES A NUMBER WITH THE SAME NUMBER
+        :param x:
+        :return:
+        """
+
+        print(self.result / x)
+        return self.result / x
+
+    def clr(self,ce):
+        test = ce.upper()
+        if test == "CE":
+            self.error = False
+            self.result = 0
 
-    def sub(self, x, y):
-        return 0
 
-# add lots more methods to this calculator class.