mathai 0.6.0__tar.gz → 0.6.1__tar.gz

{mathai-0.6.0 → mathai-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mathai
-Version: 0.6.0
+Version: 0.6.1
 Summary: Mathematics solving Ai tailored to NCERT
 Home-page: https://github.com/infinity390/mathai4
 Author: educated indians are having a low iq and are good for nothing

{mathai-0.6.0 → mathai-0.6.1}/mathai/__init__.py

@@ -44,7 +44,7 @@ from .limit import limit1, limit2, limit0, limit3
 from .univariate_inequality import wavycurvy, absolute, domain, handle_sqrt, prepare
 from .bivariate_inequality import inequality_solve
 
-from .matrix import uncommute
+from .matrix import matrix_solve
 
 from .base import *
 

{mathai-0.6.0 → mathai-0.6.1}/mathai/base.py

@@ -1,23 +1,56 @@
 import copy
 from fractions import Fraction
-
+def contains_list_or_neg(node):
+    if node.name == "f_list" or node.name.startswith("v_-"):
+        return True
+    for child in node.children:
+        if contains_list_or_neg(child):
+            return True
+    return False
 class TreeNode:
-    def __init__(self, name, children=[]):
-        
-        children = [child.copy_tree() for child in children]
+    matmul = True
+
+    def __init__(self, name, children=None):
+        if children is None:
+            children = []
+
+        # copy once
+        children = copy.deepcopy(children)
         self.name = name
-        if name in ["f_add", "f_mul"]:
-            self.children = sorted(children, key=lambda x: str_form(x))
+
+        if name == "f_add" or (name == "f_mul" and TreeNode.matmul):
+            keyed = [(str_form(c), c) for c in children]
+            self.children = [c for _, c in sorted(keyed)]
+
+        elif name == "f_mul":
+            sortable = []
+            fixed = []
+            for c in children:
+                if not contains_list_or_neg(c):
+                    sortable.append(c)
+                else:
+                    fixed.append(c)
+            if len(fixed) > 1:
+                fixed = TreeNode("f_wmul", fixed)
+            elif len(fixed) == 1:
+                fixed = fixed[0]
+            if isinstance(fixed, TreeNode):
+                sortable.append(fixed)
+            if len(sortable)==1 and name == "f_mul":
+                self.name = sortable[0].name
+                if self.name in ["f_add", "f_mul"]:
+                    self.children = list(sorted(sortable[0].children, key=lambda x: str_form(x)))
+                else:
+                    self.children = sortable[0].children
+                
+            else:
+                self.children = list(sorted(sortable, key=lambda x: str_form(x)))
         else:
             self.children = children
 
+
     def fx(self, fxname):
         return TreeNode("f_" + fxname, [self])
-    def copy_tree(node):
-        if node is None:
-            return None
-
-        return tree_form(str_form(node))
 
     def __repr__(self):
         return string_equation(str_form(self))
@@ -325,30 +358,30 @@ def product(lst):
     for item in lst[1:]:
         s *= item
     return s
-def flatten_tree(node):
+def flatten_tree(node, add=[]):
     if not node.children:
         return node
-    if node.name in ("f_add", "f_mul", "f_and", "f_or"):
+    if node.name in ["f_add", "f_mul", "f_and", "f_or"]+add:
         merged_children = []
         for child in node.children:
-            flattened_child = flatten_tree(child)
+            flattened_child = flatten_tree(child, add)
             if flattened_child.name == node.name:
                 merged_children.extend(flattened_child.children)
             else:
                 merged_children.append(flattened_child)
         return TreeNode(node.name, merged_children)
     else:
-        node.children = [flatten_tree(child) for child in node.children]
+        node.children = [flatten_tree(child, add) for child in node.children]
         return node
 def dowhile(eq, fx):
     if eq is None:
         return None
     while True:
-        orig = eq.copy_tree()
+        orig = copy.deepcopy(eq)
         eq2 = fx(eq)
         if eq2 is None:
             return None
-        eq = eq2.copy_tree()
+        eq = copy.deepcopy(eq2)
         if eq == orig:
             return orig
 def tree_form(tabbed_strings):
@@ -384,7 +417,7 @@ def string_equation_helper(equation_tree):
     s = "(" 
     if len(equation_tree.children) == 1 or equation_tree.name[2:] in [chr(ord("A")+i) for i in range(26)]+["limitpinf", "subs", "try", "ref","limit", "integrate", "exist", "forall", "sum2", "int", "pdif", "dif", "A", "B", "C", "covariance", "sum"]:
         s = equation_tree.name[2:] + s
-    sign = {"f_not":"~", "f_addw":"+", "f_mulw":"*", "f_intersection":"&", "f_union":"|", "f_sum2":",", "f_exist":",", "f_forall":",", "f_sum":",","f_covariance": ",", "f_B":",", "f_imply":"->", "f_ge":">=", "f_le":"<=", "f_gt":">", "f_lt":"<", "f_cosec":"?" , "f_equiv": "<->", "f_sec":"?", "f_cot": "?", "f_dot": ".", "f_circumcenter":"?", "f_transpose":"?", "f_exp":"?", "f_abs":"?", "f_log":"?", "f_and":"&", "f_or":"|", "f_sub":"-", "f_neg":"?", "f_inv":"?", "f_add": "+", "f_mul": "*", "f_pow": "^", "f_poly": ",", "f_div": "/", "f_sub": "-", "f_dif": ",", "f_sin": "?", "f_cos": "?", "f_tan": "?", "f_eq": "=", "f_sqrt": "?"}
+    sign = {"f_not":"~", "f_wadd":"+", "f_wmul":"*", "f_intersection":"&", "f_union":"|", "f_sum2":",", "f_exist":",", "f_forall":",", "f_sum":",","f_covariance": ",", "f_B":",", "f_imply":"->", "f_ge":">=", "f_le":"<=", "f_gt":">", "f_lt":"<", "f_cosec":"?" , "f_equiv": "<->", "f_sec":"?", "f_cot": "?", "f_dot": ".", "f_circumcenter":"?", "f_transpose":"?", "f_exp":"?", "f_abs":"?", "f_log":"?", "f_and":"&", "f_or":"|", "f_sub":"-", "f_neg":"?", "f_inv":"?", "f_add": "+", "f_mul": "*", "f_pow": "^", "f_poly": ",", "f_div": "/", "f_sub": "-", "f_dif": ",", "f_sin": "?", "f_cos": "?", "f_tan": "?", "f_eq": "=", "f_sqrt": "?"}
     arr = []
     k = None
     if equation_tree.name not in sign.keys():
@@ -392,7 +425,7 @@ def string_equation_helper(equation_tree):
     else:
         k = sign[equation_tree.name]
     for child in equation_tree.children:
-        arr.append(string_equation_helper(child.copy_tree()))
+        arr.append(string_equation_helper(copy.deepcopy(child)))
     outfinal = s + k.join(arr) + ")"+extra
     
     return outfinal.replace("+-", "-")

{mathai-0.6.0 → mathai-0.6.1}/mathai/factor.py

@@ -174,6 +174,7 @@ def factor_quar_formula_init():
     return [formula_list, var, expr]
 
 formula_gen9 = factor_quar_formula_init()
+
 def factor_helper(equation, complexnum, power=2):
     global formula_gen9
     if equation.name in ["f_or", "f_and", "f_not", "f_eq", "f_gt", "f_lt", "f_ge", "f_le"]:

{mathai-0.6.0 → mathai-0.6.1}/mathai/integrate.py

@@ -380,7 +380,6 @@ def integration_formula_init():
     formula_list = [[simplify(parse(y)) for y in x] for x in formula_list]
     expr = [[parse("A"), parse("1")], [parse("B"), parse("0")]]
     return [formula_list, var, expr]
-formula_gen = integration_formula_init()
 def integration_formula_trig():
     var = "x"
     formula_list = [(f"(A+B*sin({var})+C*cos({var}))/(D+E*sin({var})+F*cos({var}))", f"((B*E+C*F)/(E^2+F^2))*{var}+((C*E-B*F)/(E^2+F^2))*log(D+E*sin({var})+F*cos({var}))")]
@@ -389,8 +388,12 @@ def integration_formula_trig():
             [parse("C"), parse("0"), parse("1")], [parse("D"), parse("0"), parse("1")],\
             [parse("E"), parse("0"), parse("1")], [parse("F"), parse("0"), parse("1")]]
     return [formula_list, var, expr]
+
+
+formula_gen = integration_formula_init()
 formula_gen4 = integration_formula_trig()
 
+
 def integration_formula_ex():
     var = "x"
     formula_list = [

mathai-0.6.1/mathai/matrix.py

@@ -0,0 +1,96 @@
+from .base import *
+import copy
+from .simplify import simplify
+import itertools
+
+# ---------- tree <-> python list ----------
+def tree_to_py(node):
+    if node.name=="f_list":
+        return [tree_to_py(c) for c in node.children]
+    return node
+
+def py_to_tree(obj):
+    if isinstance(obj,list):
+        return TreeNode("f_list",[py_to_tree(x) for x in obj])
+    return obj
+
+# ---------- shape detection ----------
+def is_vector(x):
+    return isinstance(x,list) and all(isinstance(item,TreeNode) for item in x)
+def is_mat(x):
+    return isinstance(x,list) and all(isinstance(item,list) for item in x)
+def is_matrix(x):
+    return isinstance(x, list) and all(isinstance(item, list) and (is_mat(item) or is_vector(item)) for item in x)
+           
+
+# ---------- algebra primitives ----------
+def dot(u,v):
+    if len(u)!=len(v):
+        raise ValueError("Vector size mismatch")
+    s = tree_form("d_0")
+    for a,b in zip(u,v):
+        s = TreeNode("f_add",[s,TreeNode("f_mul",[a,b])])
+    return s
+
+def matmul(A,B):
+    n,m,p = len(A), len(A[0]), len(B[0])
+    if m!=len(B):
+        raise ValueError("Matrix dimension mismatch")
+    z = tree_form("d_0")
+    C = [[z for _ in range(p)] for _ in range(n)]
+    for i in range(n):
+        for j in range(p):
+            for k in range(m):
+                C[i][j] = TreeNode("f_add",[C[i][j], TreeNode("f_mul",[A[i][k], B[k][j]])])
+    return C
+
+# ---------- promotion ----------
+def promote(node):
+    if node.name=="f_list":
+        return tree_to_py(node)
+    return node
+def contains_neg(node):
+    if isinstance(node, list):
+        return False
+    if node.name.startswith("v_-"):
+        return False
+    for child in node.children:
+        if not contains_neg(child):
+            return False
+    return True
+# ---------- multiplication (fully simplified) ----------
+def multiply(left,right):
+    A,B = promote(left), promote(right)
+
+    # vector · vector
+    if is_vector(A) and is_vector(B):
+        return dot(A,B)
+    # matrix × matrix
+    if is_matrix(A) and is_matrix(B):
+        return py_to_tree(matmul(A,B))
+    # scalar × vector
+    for _ in range(2):
+        if contains_neg(A) and is_vector(B):
+            return py_to_tree([TreeNode("f_mul",[A,x]) for x in B])
+        # scalar × matrix
+        if contains_neg(A) and is_matrix(B):
+            return py_to_tree([[TreeNode("f_mul",[A,x]) for x in row] for row in B])
+        A, B = B, A
+    return None
+
+def fold_wmul(eq):
+    if eq.name=="f_wmul" and any(item.name=="f_list" or item.name.startswith("v_-") for item in eq.children):
+        i = len(eq.children)-1
+        while i>0:
+            out = multiply(eq.children[i], eq.children[i-1])
+            if out is not None:
+                eq.children.pop(i)
+                eq.children.pop(i-1)
+                eq.children.append(out)
+            i = i-1
+        return eq
+    return TreeNode(eq.name, [fold_wmul(child) for child in eq.children])
+def flat(eq):
+    return flatten_tree(tree_form(str_form(eq).replace("f_w","f_")))
+def matrix_solve(eq):
+    return flat(dowhile(eq, lambda x: fold_wmul(flat(x))))

{mathai-0.6.0 → mathai-0.6.1}/mathai/parser.py

@@ -33,11 +33,11 @@ grammar = """
            | comparison "<=" arithmetic -> le
            | comparison ">=" arithmetic -> ge
 
-?arithmetic: arithmetic "+" term   -> add
+?arithmetic: arithmetic "+" term   -> wadd
            | arithmetic "-" term   -> sub
            | term
 
-?term: term "*" power  -> mul
+?term: term "*" power  -> wmul
      | term "/" power  -> div
      | term "." power  -> dot
      | power
@@ -85,7 +85,7 @@ def parse(equation, funclist=None):
 
     parser_main = Lark(grammar2, start='start', parser='lalr')
     parse_tree = parser_main.parse(equation)
-
+    
     # Convert Lark tree to TreeNode
     def convert_to_treenode(parse_tree):
         if isinstance(parse_tree, Tree):
@@ -130,7 +130,7 @@ def parse(equation, funclist=None):
         if tree_node.name == "pass_through":
             return fxchange(tree_node.children[0])
         return TreeNode(
-            "f_" + tree_node.name if tree_node.name in tmp3 + ["limitpinf", "limit", "try", "ref", "sqrt","imply","forall","exist","exclude","union","intersection","len","index","angle","charge","sum2","electricfield","line","point","sum","transpose","equationrhs","equationlhs","equation","covariance","variance","expect","error","laplace","dot","curl","pdif","diverge","gradient","rad","ge","le","gt","lt","eqtri","linesegment","midpoint","mag","point1","point2","point3","line1","line2","line3","log10","arcsin","arccos","arctan","list","cosec","sec","cot","equiv","or","not","and","circumcenter","eq","sub","add","sin","cos","tan","mul","integrate","dif","pow","div","log","abs"] else "d_" + tree_node.name,
+            "f_" + tree_node.name if tree_node.name in tmp3 + ["limitpinf", "limit", "try", "ref", "sqrt","imply","forall","exist","exclude","union","intersection","len","index","angle","charge","sum2","electricfield","line","point","sum","transpose","equationrhs","equationlhs","equation","covariance","variance","expect","error","laplace","dot","curl","pdif","diverge","gradient","rad","ge","le","gt","lt","eqtri","linesegment","midpoint","mag","point1","point2","point3","line1","line2","line3","log10","arcsin","arccos","arctan","list","cosec","sec","cot","equiv","or","not","and","circumcenter","eq","sub","wadd","sin","cos","tan","wmul","integrate","dif","pow","div","log","abs"] else "d_" + tree_node.name,
             [fxchange(child) for child in tree_node.children]
         )
 
@@ -146,13 +146,13 @@ def parse(equation, funclist=None):
     for i, c in enumerate([chr(x+ord("A")) for x in range(0,26)]):
         tree_node = replace(tree_node, tree_form("d_"+c), tree_form("v_-"+str(i+1)))
         tree_node = replace(tree_node, tree_form("f_"+c), tree_form("v_-"+str(i+1)))
-
-    # Final recursive replacements
+    
     def rfx(tree_node):
         if tree_node.name[:3] == "d_c":
             return tree_form("v_" + str(int(tree_node.name[3:])+100))
         tree_node.children = [rfx(child) for child in tree_node.children]
         return tree_node
-
     tree_node = rfx(tree_node)
+    tree_node = flatten_tree(tree_node, ["f_wmul","f_wadd"])
+    tree_node = tree_form(str_form(tree_node).replace("f_w","f_"))
     return tree_node

mathai-0.6.1/mathai/parsetab.py

@@ -0,0 +1,61 @@
+
+# parsetab.py
+# This file is automatically generated. Do not edit.
+# pylint: disable=W,C,R
+_tabversion = '3.10'
+
+_lr_method = 'LALR'
+
+_lr_signature = 'leftEQUIVleftIMPLYleftORleftANDleftEQLTGTLEGEleftPLUSMINUSleftTIMESDIVDOTrightPOWrightNOTUMINUSUPLUSAND CAPITAL_ID CNUMBER COMMA DIV DOT EQ EQUIV GE GT IMPLY LBRACK LE LPAREN LT MINUS NOT NUMBER OR PLUS POW RBRACK RPAREN STRING TIMES VARIABLEstart : exprexpr : expr EQUIV exprexpr : expr IMPLY exprexpr : expr OR exprexpr : expr AND exprexpr : NOT exprexpr : expr EQ expr\n            | expr LT expr\n            | expr GT expr\n            | expr LE expr\n            | expr GE exprexpr : expr PLUS expr\n            | expr MINUS exprexpr : expr TIMES expr\n            | expr DIV expr\n            | expr DOT exprexpr : expr POW exprexpr : MINUS expr %prec UMINUSexpr : PLUS expr %prec UPLUSexpr : atomexpr : LPAREN expr RPARENexpr : LBRACK expr_list RBRACKexpr : LBRACK RBRACKexpr_list : expr_list COMMA exprexpr_list : exprexpr : VARIABLE LPAREN expr_list RPARENatom : VARIABLE\n            | CAPITAL_ID\n            | NUMBER\n            | CNUMBER\n            | STRING'
+    
+_lr_action_items = {'NOT':([0,3,4,5,7,8,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,36,54,],[3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,]),'MINUS':([0,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,56,57,],[5,24,5,5,5,-20,5,5,-27,-28,-29,-30,-31,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,-6,-19,-18,24,-23,24,5,24,24,24,24,24,24,24,24,24,-12,-13,-14,-15,-16,-17,-21,-22,5,24,-26,]),'PLUS':([0,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,56,57,],[4,23,4,4,4,-20,4,4,-27,-28,-29,-30,-31,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,-6,-19,-18,23,-23,23,4,23,23,23,23,23,23,23,23,23,-12,-13,-14,-15,-16,-17,-21,-22,4,23,-26,]),'LPAREN':([0,3,4,5,7,8,9,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,36,54,],[7,7,7,7,7,7,36,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,]),'LBRACK':([0,3,4,5,7,8,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,36,54,],[8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,]),'VARIABLE':([0,3,4,5,7,8,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,36,54,],[9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,]),'CAPITAL_ID':([0,3,4,5,7,8,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,36,54,],[10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,]),'NUMBER':([0,3,4,5,7,8,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,36,54,],[11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,]),'CNUMBER':([0,3,4,5,7,8,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,36,54,],[12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,]),'STRING':([0,3,4,5,7,8,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,36,54,],[13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,]),'$end':([1,2,6,9,10,11,12,13,29,30,31,34,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,57,],[0,-1,-20,-27,-28,-29,-30,-31,-6,-19,-18,-23,-2,-3,-4,-5,-7,-8,-9,-10,-11,-12,-13,-14,-15,-16,-17,-21,-22,-26,]),'EQUIV':([2,6,9,10,11,12,13,29,30,31,32,34,35,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,56,57,],[14,-20,-27,-28,-29,-30,-31,-6,-19,-18,14,-23,14,-2,-3,-4,-5,-7,-8,-9,-10,-11,-12,-13,-14,-15,-16,-17,-21,-22,14,-26,]),'IMPLY':([2,6,9,10,11,12,13,29,30,31,32,34,35,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,56,57,],[15,-20,-27,-28,-29,-30,-31,-6,-19,-18,15,-23,15,15,-3,-4,-5,-7,-8,-9,-10,-11,-12,-13,-14,-15,-16,-17,-21,-22,15,-26,]),'OR':([2,6,9,10,11,12,13,29,30,31,32,34,35,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,56,57,],[16,-20,-27,-28,-29,-30,-31,-6,-19,-18,16,-23,16,16,16,-4,-5,-7,-8,-9,-10,-11,-12,-13,-14,-15,-16,-17,-21,-22,16,-26,]),'AND':([2,6,9,10,11,12,13,29,30,31,32,34,35,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,56,57,],[17,-20,-27,-28,-29,-30,-31,-6,-19,-18,17,-23,17,17,17,17,-5,-7,-8,-9,-10,-11,-12,-13,-14,-15,-16,-17,-21,-22,17,-26,]),'EQ':([2,6,9,10,11,12,13,29,30,31,32,34,35,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,56,57,],[18,-20,-27,-28,-29,-30,-31,-6,-19,-18,18,-23,18,18,18,18,18,-7,-8,-9,-10,-11,-12,-13,-14,-15,-16,-17,-21,-22,18,-26,]),'LT':([2,6,9,10,11,12,13,29,30,31,32,34,35,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,56,57,],[19,-20,-27,-28,-29,-30,-31,-6,-19,-18,19,-23,19,19,19,19,19,-7,-8,-9,-10,-11,-12,-13,-14,-15,-16,-17,-21,-22,19,-26,]),'GT':([2,6,9,10,11,12,13,29,30,31,32,34,35,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,56,57,],[20,-20,-27,-28,-29,-30,-31,-6,-19,-18,20,-23,20,20,20,20,20,-7,-8,-9,-10,-11,-12,-13,-14,-15,-16,-17,-21,-22,20,-26,]),'LE':([2,6,9,10,11,12,13,29,30,31,32,34,35,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,56,57,],[21,-20,-27,-28,-29,-30,-31,-6,-19,-18,21,-23,21,21,21,21,21,-7,-8,-9,-10,-11,-12,-13,-14,-15,-16,-17,-21,-22,21,-26,]),'GE':([2,6,9,10,11,12,13,29,30,31,32,34,35,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,56,57,],[22,-20,-27,-28,-29,-30,-31,-6,-19,-18,22,-23,22,22,22,22,22,-7,-8,-9,-10,-11,-12,-13,-14,-15,-16,-17,-21,-22,22,-26,]),'TIMES':([2,6,9,10,11,12,13,29,30,31,32,34,35,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,56,57,],[25,-20,-27,-28,-29,-30,-31,-6,-19,-18,25,-23,25,25,25,25,25,25,25,25,25,25,25,25,-14,-15,-16,-17,-21,-22,25,-26,]),'DIV':([2,6,9,10,11,12,13,29,30,31,32,34,35,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,56,57,],[26,-20,-27,-28,-29,-30,-31,-6,-19,-18,26,-23,26,26,26,26,26,26,26,26,26,26,26,26,-14,-15,-16,-17,-21,-22,26,-26,]),'DOT':([2,6,9,10,11,12,13,29,30,31,32,34,35,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,56,57,],[27,-20,-27,-28,-29,-30,-31,-6,-19,-18,27,-23,27,27,27,27,27,27,27,27,27,27,27,27,-14,-15,-16,-17,-21,-22,27,-26,]),'POW':([2,6,9,10,11,12,13,29,30,31,32,34,35,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,56,57,],[28,-20,-27,-28,-29,-30,-31,-6,-19,-18,28,-23,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,-21,-22,28,-26,]),'RPAREN':([6,9,10,11,12,13,29,30,31,32,34,35,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,55,56,57,],[-20,-27,-28,-29,-30,-31,-6,-19,-18,52,-23,-25,-2,-3,-4,-5,-7,-8,-9,-10,-11,-12,-13,-14,-15,-16,-17,-21,-22,57,-24,-26,]),'RBRACK':([6,8,9,10,11,12,13,29,30,31,33,34,35,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,56,57,],[-20,34,-27,-28,-29,-30,-31,-6,-19,-18,53,-23,-25,-2,-3,-4,-5,-7,-8,-9,-10,-11,-12,-13,-14,-15,-16,-17,-21,-22,-24,-26,]),'COMMA':([6,9,10,11,12,13,29,30,31,33,34,35,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,55,56,57,],[-20,-27,-28,-29,-30,-31,-6,-19,-18,54,-23,-25,-2,-3,-4,-5,-7,-8,-9,-10,-11,-12,-13,-14,-15,-16,-17,-21,-22,54,-24,-26,]),}
+
+_lr_action = {}
+for _k, _v in _lr_action_items.items():
+   for _x,_y in zip(_v[0],_v[1]):
+      if not _x in _lr_action:  _lr_action[_x] = {}
+      _lr_action[_x][_k] = _y
+del _lr_action_items
+
+_lr_goto_items = {'start':([0,],[1,]),'expr':([0,3,4,5,7,8,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,36,54,],[2,29,30,31,32,35,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,35,56,]),'atom':([0,3,4,5,7,8,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,36,54,],[6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,]),'expr_list':([8,36,],[33,55,]),}
+
+_lr_goto = {}
+for _k, _v in _lr_goto_items.items():
+   for _x, _y in zip(_v[0], _v[1]):
+       if not _x in _lr_goto: _lr_goto[_x] = {}
+       _lr_goto[_x][_k] = _y
+del _lr_goto_items
+_lr_productions = [
+  ("S' -> start","S'",1,None,None,None),
+  ('start -> expr','start',1,'p_start','parser.py',98),
+  ('expr -> expr EQUIV expr','expr',3,'p_expr_equiv','parser.py',105),
+  ('expr -> expr IMPLY expr','expr',3,'p_expr_imply','parser.py',109),
+  ('expr -> expr OR expr','expr',3,'p_expr_or','parser.py',113),
+  ('expr -> expr AND expr','expr',3,'p_expr_and','parser.py',117),
+  ('expr -> NOT expr','expr',2,'p_expr_not','parser.py',121),
+  ('expr -> expr EQ expr','expr',3,'p_expr_cmp','parser.py',128),
+  ('expr -> expr LT expr','expr',3,'p_expr_cmp','parser.py',129),
+  ('expr -> expr GT expr','expr',3,'p_expr_cmp','parser.py',130),
+  ('expr -> expr LE expr','expr',3,'p_expr_cmp','parser.py',131),
+  ('expr -> expr GE expr','expr',3,'p_expr_cmp','parser.py',132),
+  ('expr -> expr PLUS expr','expr',3,'p_expr_add','parser.py',146),
+  ('expr -> expr MINUS expr','expr',3,'p_expr_add','parser.py',147),
+  ('expr -> expr TIMES expr','expr',3,'p_expr_mul','parser.py',154),
+  ('expr -> expr DIV expr','expr',3,'p_expr_mul','parser.py',155),
+  ('expr -> expr DOT expr','expr',3,'p_expr_mul','parser.py',156),
+  ('expr -> expr POW expr','expr',3,'p_expr_pow','parser.py',165),
+  ('expr -> MINUS expr','expr',2,'p_expr_uminus','parser.py',172),
+  ('expr -> PLUS expr','expr',2,'p_expr_uplus','parser.py',176),
+  ('expr -> atom','expr',1,'p_expr_atom','parser.py',183),
+  ('expr -> LPAREN expr RPAREN','expr',3,'p_expr_paren','parser.py',187),
+  ('expr -> LBRACK expr_list RBRACK','expr',3,'p_expr_list','parser.py',191),
+  ('expr -> LBRACK RBRACK','expr',2,'p_expr_list_single','parser.py',195),
+  ('expr_list -> expr_list COMMA expr','expr_list',3,'p_expr_list_list','parser.py',199),
+  ('expr_list -> expr','expr_list',1,'p_expr_list_item','parser.py',203),
+  ('expr -> VARIABLE LPAREN expr_list RPAREN','expr',4,'p_expr_func','parser.py',207),
+  ('atom -> VARIABLE','atom',1,'p_atom_var','parser.py',214),
+  ('atom -> CAPITAL_ID','atom',1,'p_atom_var','parser.py',215),
+  ('atom -> NUMBER','atom',1,'p_atom_var','parser.py',216),
+  ('atom -> CNUMBER','atom',1,'p_atom_var','parser.py',217),
+  ('atom -> STRING','atom',1,'p_atom_var','parser.py',218),
+]

{mathai-0.6.0 → mathai-0.6.1}/mathai.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mathai
-Version: 0.6.0
+Version: 0.6.1
 Summary: Mathematics solving Ai tailored to NCERT
 Home-page: https://github.com/infinity390/mathai4
 Author: educated indians are having a low iq and are good for nothing

{mathai-0.6.0 → mathai-0.6.1}/mathai.egg-info/SOURCES.txt

@@ -17,6 +17,7 @@ mathai/logic.py
 mathai/matrix.py
 mathai/ode.py
 mathai/parser.py
+mathai/parsetab.py
 mathai/printeq.py
 mathai/simplify.py
 mathai/structure.py

{mathai-0.6.0 → mathai-0.6.1}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="mathai",
-    version="0.6.0",
+    version="0.6.1",
     description="Mathematics solving Ai tailored to NCERT",
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",

mathai-0.6.0/mathai/matrix.py

@@ -1,22 +0,0 @@
-def uncommute(eq, inside=False):
-    if not inside and eq.name in ["f_add", "f_mul"]:
-        return TreeNode(eq.name[:2]+"w"+eq.name[2:], [uncommute(child) for child in eq.children])
-    return TreeNode(eq.name, [uncommute(child, True) if eq.name == "f_list" else uncommute(child, inside) for child in eq.children])
-
-def matrix_solve(eq):
-    if eq.name == "f_wadd":
-        output = None
-        output2 = []
-        for child in eq.children:
-            if child.name == "f_list":
-                if output is None:
-                    output = []
-                    for i in range(len(child.children)):
-                        output.append([child.children[i]])
-                else:
-                    for i in range(len(child.children)):
-                        output[i] += [child.children[i]]
-                output.append(child)
-            else:
-                output2.append(child)
-        output = [summation(item) for item in output]