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

mathai/base.py

@@ -1,11 +1,12 @@
 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):
+    stack = [node]
+    while stack:
+        n = stack.pop()
+        if n.name == "f_list" or n.name.startswith("v_-"):
             return True
+        stack.extend(n.children)
     return False
 class TreeNode:
     matmul = None
@@ -30,28 +31,32 @@ class TreeNode:
                     sortable.append(c)
                 else:
                     fixed.append(c)
+                    
+            if len(sortable) > 1:
+                sortable = TreeNode("f_dmul", list(sorted(sortable, key=lambda x: str_form(x))))
+                sortable.name = "f_mul"
+                
+            elif len(sortable) == 1:
+                sortable = sortable[0]
+                
+            if isinstance(sortable, TreeNode):
+                fixed.append(sortable)
             if len(fixed) > 1:
-                fixed = TreeNode("f_wmul", fixed)
+                self.name = "f_wmul"
             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
+                self.name = fixed[0].name
+                fixed = fixed[0].children
                 
-            else:
-                self.children = list(sorted(sortable, key=lambda x: str_form(x)))
+                
+            self.children = fixed
         else:
             self.children = children
 
 
     def fx(self, fxname):
         return TreeNode("f_" + fxname, [self])
-
+    def copy_tree(self):
+        return copy.deepcopy(self)
     def __repr__(self):
         return string_equation(str_form(self))
 

mathai/matrix.py

@@ -32,16 +32,26 @@ def dot(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):
+def matmul(A, B):
+    # A: n × m
+    # B: m × p
+    
+    n = len(A)
+    m = len(A[0])
+    p = 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)]
+
+    C = [[tree_form("d_0") 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]])])
+                C[i][j] = TreeNode(
+                    "f_add",
+                    [C[i][j], TreeNode("f_mul", [A[i][k], B[k][j]])]
+                )
     return C
 
 # ---------- promotion ----------
@@ -60,6 +70,13 @@ def contains_neg(node):
     return True
 # ---------- multiplication (fully simplified) ----------
 def multiply(left,right):
+    left2, right2 = left, right
+    if left2.name != "f_pow":
+        left2 = left2 ** 1
+    if right2.name != "f_pow":
+        right2 = right2 ** 1
+    if left2.name == "f_pow" and right2.name == "f_pow" and left2.children[0]==right2.children[0]:
+        return simplify(left2.children[0]**(left2.children[1]+right2.children[1]))
     A,B = promote(left), promote(right)
 
     # vector · vector
@@ -77,25 +94,131 @@ def multiply(left,right):
             return py_to_tree([[TreeNode("f_mul",[A,x]) for x in row] for row in B])
         A, B = B, A
     return None
+def add_vec(A, B):
+    if len(A) != len(B):
+        raise ValueError("Vector dimension mismatch")
+
+    return [
+        TreeNode("f_add", [A[i], B[i]])
+        for i in range(len(A))
+    ]
+def matadd(A, B):
+    if len(A) != len(B) or len(A[0]) != len(B[0]):
+        raise ValueError("Matrix dimension mismatch")
+
+    n = len(A)
+    m = len(A[0])
 
+    return [
+        [
+            TreeNode("f_add", [A[i][j], B[i][j]])
+            for j in range(m)
+        ]
+        for i in range(n)
+    ]
+def addition(left,right):
+    A,B = promote(left), promote(right)
+    # vector + vector
+    if is_vector(A) and is_vector(B):
+        return add_vec(A,B)
+    # matrix + matrix
+    if is_matrix(A) and is_matrix(B):
+        return py_to_tree(matadd(A,B))
+    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
+    if eq.name == "f_pow" and eq.children[1].name.startswith("d_"):
+        n = int(eq.children[1].name[2:])
+        if n == 1:
+            eq = eq.children[0]
+        elif n > 1:
+            tmp = promote(eq.children[0])
+            if is_matrix(tmp):
+                orig =tmp
+                for i in range(n-1):
+                    tmp = matmul(orig, tmp)
+                eq = py_to_tree(tmp)
+    elif eq.name in ["f_wmul", "f_add"]:
+        if len(eq.children) == 1:
+            eq = eq.children[0]
+        else:
+            i = len(eq.children)-1
+            while i>0:
+                if eq.name == "f_wmul":
+                    out = multiply(eq.children[i-1], eq.children[i])
+                else:
+                    out = addition(eq.children[i-1], eq.children[i])
+                if out is not None:
+                    eq.children.pop(i)
+                    eq.children.pop(i-1)
+                    eq.children.insert(i-1,out)
+                i = i-1
     return TreeNode(eq.name, [fold_wmul(child) for child in eq.children])
+'''
+def fold_wmul(root):
+    # Post-order traversal using explicit stack
+    stack = [(root, False)]
+    newnode = {}
+
+    while stack:
+        node, visited = stack.pop()
+
+        if not visited:
+            # First time: push back as visited, then children
+            stack.append((node, True))
+            for child in node.children:
+                stack.append((child, False))
+        else:
+            # All children already processed
+            children = [newnode[c] for c in node.children]
+            eq = TreeNode(node.name, children)
+
+            # ---- original rewrite logic ----
+
+            if eq.name == "f_pow" and eq.children[1].name.startswith("d_"):
+                n = int(eq.children[1].name[2:])
+                if n == 1:
+                    eq = eq.children[0]
+                elif n > 1:
+                    tmp = promote(eq.children[0])
+                    if is_matrix(tmp):
+                        orig = tmp
+                        for _ in range(n - 1):
+                            tmp = matmul(orig, tmp)
+                        eq = py_to_tree(tmp)
+
+            elif eq.name in ["f_wmul", "f_add"]:
+                if len(eq.children) == 1:
+                    eq = eq.children[0]
+                else:
+                    i = len(eq.children) - 1
+                    while i > 0:
+                        if eq.name == "f_wmul":
+                            out = multiply(eq.children[i - 1], eq.children[i])
+                        else:
+                            out = addition(eq.children[i - 1], eq.children[i])
+
+                        if out is not None:
+                            eq.children.pop(i)
+                            eq.children.pop(i - 1)
+                            eq.children.insert(i - 1, out)
+                        i -= 1
+
+            # --------------------------------
+
+            newnode[node] = eq
+
+    return newnode[root]
+
 def flat(eq):
-    return flatten_tree(tree_form(str_form(eq).replace("f_w","f_")))
-def matrix_solve(eq):
+    return flatten_tree(eq, ["f_wmul"])
+def use(eq):
+    return TreeNode(eq.name, [use(child) for child in eq.children])
+def _matrix_solve(eq):
     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
+def matrix_solve(eq):
+    return _matrix_solve(eq)

mathai/parser.py

@@ -158,4 +158,6 @@ def parse(equation, funclist=None):
         TreeNode.matmul = False
         tree_node = tree_form(str_form(tree_node).replace("f_w","f_"))
         TreeNode.matmul = True
+    else:
+        tree_node = tree_form(str_form(tree_node).replace("f_w","f_"))
     return tree_node

mathai/simplify.py

@@ -20,7 +20,6 @@ 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.3.dist-info → mathai-0.6.5.dist-info}/METADATA

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

@@ -1,6 +1,6 @@
 mathai/__init__.py,sha256=gzddzgNCG3Bg5BnqrDYvO71SzK4hu9fbo4nGEaDaG5Q,1554
 mathai/apart.py,sha256=VSS3khE9PNuxiRvdU5JDl4IN-KJBSIFjwR17pkhviXI,4197
-mathai/base.py,sha256=_VIVHzJ2wYAJjPn7asNvrhlHOqTtOwUgmohvmA9pUso,15552
+mathai/base.py,sha256=aTyWgaQUmJ31OVEkm9K71JN02Pz0zk4rSta7xkdQK8g,15582
 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=atXZlgiDgqI3cRyQ78GrDCWiy7oWWelq-XHvC_kH_DE,3324
+mathai/matrix.py,sha256=a3SeAjrsg2wVKy-uETOGTCEClL3NMBxGsLOM15sHEwY,7177
 mathai/ode.py,sha256=zxxTXAOpt7oSsfpgI4vHsCWKXevmM96ZOBZWWs-vj8Y,4801
-mathai/parser.py,sha256=dhI4hRiYDdmSAOrhIWkBs_Boo2BFzC1m5cbAOOfHUas,7220
+mathai/parser.py,sha256=YzXCW5MmwL3J0BhR0ZrPS2wnfz77uB_enBXPjITc-a0,7303
 mathai/parsetab.py,sha256=TL-4jvRM_Tx6ipwet8CFJc2DkjR4tGsbrGF_r4IC8xI,9651
 mathai/printeq.py,sha256=MKsR6-qXig80R07vLnFPYHQMeS41FrMVj3n3arrhJpQ,1329
-mathai/simplify.py,sha256=HeZqQbB9SD7CAduvotQOiv4hFqGe68ZmNLl9LLJ7sAo,19619
+mathai/simplify.py,sha256=nvpwTLEgnGeXgc9NGGmQLAjKZ9c4XTdEVqAuo04oSrw,19588
 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.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,,
+mathai-0.6.5.dist-info/METADATA,sha256=jLOXmfTrc1arF3RvTQdTST_-xoMdZJuakP21omUBwcs,7103
+mathai-0.6.5.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+mathai-0.6.5.dist-info/top_level.txt,sha256=ROP4l3OhGYw3ihkQGASr18xM9GsK4z3_6whV5AyXLwE,7
+mathai-0.6.5.dist-info/RECORD,,