mathai 0.6.1__py3-none-any.whl → 0.6.3__py3-none-any.whl

mathai/base.py

@@ -8,7 +8,7 @@ def contains_list_or_neg(node):
             return True
     return False
 class TreeNode:
-    matmul = True
+    matmul = None
 
     def __init__(self, name, children=None):
         if children is None:
@@ -18,11 +18,11 @@ class TreeNode:
         children = copy.deepcopy(children)
         self.name = name
 
-        if name == "f_add" or (name == "f_mul" and TreeNode.matmul):
+        if name == "f_add" or (name == "f_mul" and (TreeNode.matmul == True or TreeNode.matmul is None)):
             keyed = [(str_form(c), c) for c in children]
             self.children = [c for _, c in sorted(keyed)]
 
-        elif name == "f_mul":
+        elif name == "f_mul" and TreeNode.matmul == False:
             sortable = []
             fixed = []
             for c in children:
@@ -291,7 +291,7 @@ def compute(eq):
         return values[0] - values[1]
     elif eq.name == "f_rad":
         return values[0] * math.pi / 180
-    elif eq.name == "f_mul":
+    elif eq.name in ["f_wmul", "f_mul"]:
         result = 1.0
         for v in values:
             result *= v

mathai/matrix.py

@@ -93,4 +93,9 @@ def fold_wmul(eq):
 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))))
+    if TreeNode.matmul == True:
+        TreeNode.matmul = False
+        eq = simplify(eq)
+        eq = flat(dowhile(eq, lambda x: fold_wmul(flat(x))))
+        TreeNode.matmul = True
+    return eq

mathai/parser.py

@@ -33,7 +33,7 @@ grammar = """
            | comparison "<=" arithmetic -> le
            | comparison ">=" arithmetic -> ge
 
-?arithmetic: arithmetic "+" term   -> wadd
+?arithmetic: arithmetic "+" term   -> add
            | arithmetic "-" term   -> sub
            | term
 
@@ -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","wadd","sin","cos","tan","wmul","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","add","sin","cos","tan","wmul","integrate","dif","pow","div","log","abs"] else "d_" + tree_node.name,
             [fxchange(child) for child in tree_node.children]
         )
 
@@ -153,6 +153,9 @@ def parse(equation, funclist=None):
         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_"))
+    tree_node = flatten_tree(tree_node, ["f_wmul"])
+    if TreeNode.matmul == True:
+        TreeNode.matmul = False
+        tree_node = tree_form(str_form(tree_node).replace("f_w","f_"))
+        TreeNode.matmul = True
     return tree_node

mathai/simplify.py

@@ -20,6 +20,7 @@ def clear_div(eq, denom):
         return tree_form("d_0"), True
     lst3 = []
     for item in lst:
+        print(str_form(item))
         if "v_" not in str_form(item) and compute(item) < 0:
             lst3.append(item)
     sign = denom

{mathai-0.6.1.dist-info → mathai-0.6.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mathai
-Version: 0.6.1
+Version: 0.6.3
 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.1.dist-info → mathai-0.6.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
 mathai/__init__.py,sha256=gzddzgNCG3Bg5BnqrDYvO71SzK4hu9fbo4nGEaDaG5Q,1554
 mathai/apart.py,sha256=VSS3khE9PNuxiRvdU5JDl4IN-KJBSIFjwR17pkhviXI,4197
-mathai/base.py,sha256=MUkx3hdM6W6CYYrGMxKYbchxXlll0_7Q8e6SeoDWnGc,15474
+mathai/base.py,sha256=_VIVHzJ2wYAJjPn7asNvrhlHOqTtOwUgmohvmA9pUso,15552
 mathai/bivariate_inequality.py,sha256=Da-A1kqVynR0tNOlEI7GSTf5T2vNkcF4etL9-EoyPJg,11415
 mathai/console.py,sha256=Sn58iwYE79MLEh67s8X3q6vZjw6g7f9XM1T8_dBBR2o,3048
 mathai/diff.py,sha256=RSTwlfeddvYXUDShCeRdcPjsmAS8Vf5OkYJAaUBPaiM,3060
@@ -12,17 +12,17 @@ mathai/inverse.py,sha256=ya7P8WjzfaAL3UXL7xqOh5GaIsXLDZ-F6lZFy3IEgaQ,2931
 mathai/limit.py,sha256=9F8i9UZh2xb-V8A5Sd1gdhDf9c2RFgpE1GdNn9MvbWI,5703
 mathai/linear.py,sha256=viGlPU8BPrjLWHlyNUvnfPHNH5d4ZBImiQMdyXaKGg0,5702
 mathai/logic.py,sha256=Ndz4Fd6aNCmzFlqoPyyIpSmV_BXmYHsurePjLyZJoNc,9809
-mathai/matrix.py,sha256=wp2EZ8Q-HmiyfH6OCUkXtTuWD4GM8kaKsUmypgubhtM,3182
+mathai/matrix.py,sha256=atXZlgiDgqI3cRyQ78GrDCWiy7oWWelq-XHvC_kH_DE,3324
 mathai/ode.py,sha256=zxxTXAOpt7oSsfpgI4vHsCWKXevmM96ZOBZWWs-vj8Y,4801
-mathai/parser.py,sha256=wP3YMyRL_25ccfxudHdg0ebjsUFc6YBvYBGdxDBkZ6k,7129
+mathai/parser.py,sha256=dhI4hRiYDdmSAOrhIWkBs_Boo2BFzC1m5cbAOOfHUas,7220
 mathai/parsetab.py,sha256=TL-4jvRM_Tx6ipwet8CFJc2DkjR4tGsbrGF_r4IC8xI,9651
 mathai/printeq.py,sha256=MKsR6-qXig80R07vLnFPYHQMeS41FrMVj3n3arrhJpQ,1329
-mathai/simplify.py,sha256=nvpwTLEgnGeXgc9NGGmQLAjKZ9c4XTdEVqAuo04oSrw,19588
+mathai/simplify.py,sha256=HeZqQbB9SD7CAduvotQOiv4hFqGe68ZmNLl9LLJ7sAo,19619
 mathai/structure.py,sha256=wrU7kqphSN7CqaVffyHHXD2-3t5My_Z_TtYFoUe_lTU,4099
 mathai/tool.py,sha256=ozcXTXLbKUnyPM9r9kz9M43YA2CBcWezcqLZfEs8rpc,6051
 mathai/trig.py,sha256=fnBbfiopcQzFg4ya1BoO5M0X_aCBnse2bjnKh1juw4I,11223
 mathai/univariate_inequality.py,sha256=LPFdWgC1y5zBwnsy1wwZxj-yP_SbqFDhCmTTzhuwoiY,16469
-mathai-0.6.1.dist-info/METADATA,sha256=IhnedME2qfzhx0lg1z72oefVQKFjcHRYGJON58qwa_Q,7103
-mathai-0.6.1.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-mathai-0.6.1.dist-info/top_level.txt,sha256=ROP4l3OhGYw3ihkQGASr18xM9GsK4z3_6whV5AyXLwE,7
-mathai-0.6.1.dist-info/RECORD,,
+mathai-0.6.3.dist-info/METADATA,sha256=ecYnPYus3Nd-KLLG3JOi3YCocVvzqff3iZwgecdebiM,7103
+mathai-0.6.3.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+mathai-0.6.3.dist-info/top_level.txt,sha256=ROP4l3OhGYw3ihkQGASr18xM9GsK4z3_6whV5AyXLwE,7
+mathai-0.6.3.dist-info/RECORD,,