mathai 0.6.3__tar.gz → 0.6.4__tar.gz

{mathai-0.6.3 → mathai-0.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mathai
-Version: 0.6.3
+Version: 0.6.4
 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 → mathai-0.6.4}/mathai/base.py

@@ -45,6 +45,9 @@ class TreeNode:
                 
             else:
                 self.children = list(sorted(sortable, key=lambda x: str_form(x)))
+        elif name == "f_mul" and TreeNode.matmul == 0:
+            
+            self.children = children
         else:
             self.children = children
 

{mathai-0.6.3 → mathai-0.6.4}/mathai/matrix.py

@@ -60,6 +60,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
@@ -79,23 +86,33 @@ def multiply(left,right):
     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):
+    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=="f_wmul":
+        
         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)
+                eq.children.insert(i-1,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_")))
+    return flatten_tree(eq, ["f_wmul"])
 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

{mathai-0.6.3 → mathai-0.6.4}/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 → mathai-0.6.4}/mathai.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mathai
-Version: 0.6.3
+Version: 0.6.4
 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 → mathai-0.6.4}/setup.py

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