mathai 0.6.5__tar.gz → 0.6.6__tar.gz

{mathai-0.6.5 → mathai-0.6.6}/PKG-INFO

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

@@ -19,7 +19,7 @@ class TreeNode:
         children = copy.deepcopy(children)
         self.name = name
 
-        if name == "f_add" or (name == "f_mul" and (TreeNode.matmul == True or TreeNode.matmul is None)):
+        if name == "f_add" or (name == "f_mul" and TreeNode.matmul is None):
             keyed = [(str_form(c), c) for c in children]
             self.children = [c for _, c in sorted(keyed)]
 
@@ -366,7 +366,8 @@ def product(lst):
 def flatten_tree(node, add=[]):
     if not node.children:
         return node
-    if node.name in ["f_add", "f_mul", "f_and", "f_or"]+add:
+    ad = []
+    if node.name in ["f_add", "f_mul", "f_and", "f_or", "f_wmul"]:
         merged_children = []
         for child in node.children:
             flattened_child = flatten_tree(child, add)

{mathai-0.6.5 → mathai-0.6.6}/mathai/matrix.py

@@ -217,7 +217,7 @@ def use(eq):
 def _matrix_solve(eq):
     if TreeNode.matmul == True:
         TreeNode.matmul = False
-        eq = flat(dowhile(eq, lambda x: fold_wmul(flat(x))))
+        eq = flat(fold_wmul(flat(eq)))
         TreeNode.matmul = True
     return eq
 def matrix_solve(eq):

{mathai-0.6.5 → mathai-0.6.6}/mathai/simplify.py

@@ -500,6 +500,9 @@ def solve3(eq):
 def simplify(eq, basic=True):
     if eq is None:
         return None
+    orig = TreeNode.matmul
+    if TreeNode.matmul == True:
+        TreeNode.matmul = False
     if eq.name == "f_and" or eq.name == "f_not" or eq.name == "f_or":
         new_children = []
         for child in eq.children:
@@ -518,4 +521,6 @@ def simplify(eq, basic=True):
     eq = flatten_tree(eq)
     if basic:
         eq = convert_to_basic(eq)
-    return solve3(eq)
+    eq = solve3(eq)
+    TreeNode.matmul = orig
+    return eq

{mathai-0.6.5 → mathai-0.6.6}/mathai.egg-info/PKG-INFO

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

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