Merge branch 'develop' into release

Author: somov7

calculator.py

@@ -1,13 +1,26 @@
 import sys
-
+import math
 
 class Parser:
     def parse(self, expr):
         tokens = []
+        functions = ['sin', 'cos'] 
         currentlyNumber = False
         currentlyFrac = False
+        currentlyFunc = False
         number = 0
+        func = ''
         for c in expr:
+            if currentlyNumber and c not in '0123456789.':
+                currentlyNumber = False
+                currentlyFrac = False
+                tokens.append(float(number))
+            elif currentlyFunc and not ('a' <= c and c <= 'z'):
+                if func in functions:
+                    tokens.append(func[0])
+                    currentlyFunc = False
+                else:
+                    return False
             if ('0' <= c and c <= '9') or c == '.':
                 if c == '.':
                     if currentlyFrac is False:
@@ -20,11 +33,13 @@ def parse(self, expr):
                     currentlyNumber = True
                     number = c
                 continue
-            elif currentlyNumber:
-                currentlyNumber = False
-                currentlyFrac = False
-                tokens.append(float(number))
-            if c in "+-*/()":
+            elif 'a' <= c and c <= 'z':
+                if currentlyFunc:
+                    func += c
+                else:
+                    currentlyFunc = True
+                    func = c
+            elif c in "+-*/^()":
                 tokens.append(c)
             elif c == ' ':
                 continue
@@ -37,7 +52,7 @@ def parse(self, expr):
             if isinstance(prev_token, str):
                 if prev_token == '(' and tokens[i] == ')':
                     return False
-                if prev_token in "(+-*/":
+                if prev_token in "(+-*/^sc":
                     if tokens[i] == '+':
                         tokens[i] = '#'
                     elif tokens[i] == '-':
@@ -49,7 +64,6 @@ def parse(self, expr):
         return tokens
 
 class Calculator:
-
     def shuntingYard(self, tokens):
         out = []
         operator = []
@@ -65,16 +79,22 @@ def shuntingYard(self, tokens):
                     return False
                 else:
                     operator.pop()
+            elif token in "sc":
+                operator.append(token)
             elif token in "#_":
-                while operator and operator[-1] in "#_":
+                while operator and operator[-1] in "#_sc":
+                    out.append(operator.pop())
+                operator.append(token)
+            elif token == '^':    
+                while operator and operator[-1] in "#_^sc":
                     out.append(operator.pop())
                 operator.append(token)
             elif token in "*/":    
-                while operator and operator[-1] in "#_*/":
+                while operator and operator[-1] in "#_^*/sc":
                     out.append(operator.pop())
                 operator.append(token)
             elif token in "+-":    
-                while operator and operator[-1] in "#_*/+-":
+                while operator and operator[-1] in "#_^*/+-sc":
                     out.append(operator.pop())
                 operator.append(token)     
         while operator:
@@ -95,7 +115,7 @@ def calculate(self, string, postfix = False):
                 return False
             if isinstance(token, float):
                 stack.append(token)
-            elif token in "#_":
+            elif token in "#_sc":
                 if stack:
                     first = stack.pop()
                 else:
@@ -125,9 +145,15 @@ def evaluate(self, operation, first, second = 0):
             return first * second
         elif operation == '/':
             return first / second
+        elif operation == '^':
+            return math.pow(first, second)
         elif operation == '#':
             return first
         elif operation == '_':
             return -first
+        elif operation == 's':
+            return math.sin(first)
+        elif operation == 'c':
+            return math.cos(first)
         else:
             return False