mathai 0.8.0__py3-none-any.whl → 0.8.1__py3-none-any.whl

mathai/apart.py

@@ -107,13 +107,14 @@ def _apart(eq, v=None):
     
     lst = poly(s.children[0], v)
     
-    lst = [TreeNode("f_eq", [item, tree_form("d_0")]) for item in lst if "v_" in str_form(item)]
+    lst = [simplify(TreeNode("f_eq", [item, tree_form("d_0")])) for item in lst if "v_" in str_form(item)]
     lst2 = []
     for item in lst:
         lst2+=vlist(item)
     origv = list(set(lst2)-set(origv))
     
     out = linear_solve(TreeNode("f_and", lst), [tree_form(item) for item in origv])
+
     for item in out.children:
         
         final3 = replace(final3, tree_form(list(set(vlist(item))&set(origv))[0]), inverse(item.children[0], list(set(vlist(item))&set(origv))[0]))
@@ -139,4 +140,6 @@ def apart(eq):
             return eq2
        
         return TreeNode(eq.name, [helper(child) for child in eq.children])
-    return fx(helper(eq))
+    eq = helper(eq)
+    eq = fx(eq)
+    return eq

mathai/base.py

@@ -334,7 +334,7 @@ def vlist(eq):
         out.append(eq.name)
     for child in eq.children:
         out += vlist(child)
-    return sorted(list(set(out)), key=lambda x: int(x[2:]))
+    return list(sorted(list(set(out)), key=lambda x: int(x[2:])))
 def product(lst):
     if lst == []:
         return tree_form("d_1")

mathai/linear.py

@@ -8,7 +8,7 @@ from .base import *
 from .factor import factorconst
 from .tool import poly
 def ss(eq):
-    return dowhile(eq, lambda x: fraction(expand(simplify(x))))
+    return dowhile(eq, lambda x: fraction(simplify(x)))
 def rref(matrix):
     rows, cols = len(matrix), len(matrix[0])
     lead = 0
@@ -34,12 +34,14 @@ def rref(matrix):
     return matrix
 def islinear(eq, fxconst):
     eq =simplify(eq)
-    if all(fxconst(tree_form(item)) and poly(eq, item) is not None and len(poly(eq, item)) <= 2 for item in vlist(eq)):
+    if all(not fxconst(tree_form(item)) or (fxconst(tree_form(item)) and poly(eq, item) is not None and len(poly(eq, item)) <= 2)for item in vlist(eq)):
         return True
+    else:
+        pass
     return False
 def linear(eqlist, fxconst):
     orig = [item.copy_tree() for item in eqlist]
-
+    
     if eqlist == [] or not all(islinear(eq, fxconst) for eq in eqlist):
         return None
 
@@ -53,10 +55,11 @@ def linear(eqlist, fxconst):
     for eq in eqlist:
         varlist(eq, fxconst)
     vl = list(set(vl))
-
+    
     if len(vl) > len(eqlist):
         return TreeNode("f_and", [TreeNode("f_eq", [x, tree_form("d_0")]) for x in eqlist])
     m = []
+    
     for eq in eqlist:
         s = copy.deepcopy(eq)
         row = []
@@ -149,6 +152,7 @@ def linear_solve(eq, lst=None):
     if lst is None:
         out = linear(copy.deepcopy(eqlist), lambda x: "v_" in str_form(x))
     else:
+        
         out = linear(copy.deepcopy(eqlist), lambda x: any(contain(x, item) for item in lst))
     if out is None:
         return None

{mathai-0.8.0.dist-info → mathai-0.8.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mathai
-Version: 0.8.0
+Version: 0.8.1
 Summary: Mathematics solving Ai tailored to NCERT
 Home-page: https://github.com/infinity390/mathai4
 Requires-Python: >=3.7

{mathai-0.8.0.dist-info → mathai-0.8.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 mathai/__init__.py,sha256=JdRPSes54qhzvi6f8Rni2sXljzzirrWZsaCmu9W9rws,1525
-mathai/apart.py,sha256=VSS3khE9PNuxiRvdU5JDl4IN-KJBSIFjwR17pkhviXI,4197
-mathai/base.py,sha256=zha7eOnfLjJuQcwi29rE0588U1R8v-0zulVPatr2aQo,14843
+mathai/apart.py,sha256=CbCX4pAWIaJgu21wZcW9XdEf82oXgxmtTyD3tUI31Ls,4235
+mathai/base.py,sha256=Qp3V5kpEZpg1fM_pB8y5upjkuoIc3I_UUlkhpTj0-3Y,14849
 mathai/bivariate_inequality.py,sha256=Da-A1kqVynR0tNOlEI7GSTf5T2vNkcF4etL9-EoyPJg,11415
 mathai/diff.py,sha256=GEiAGMCTT0dO-ULTUGvTlBKy-Io-r2xcgvFJfmqGurY,6879
 mathai/expand.py,sha256=yioVkQrtCz1fC8npcnokN1WwvJlGxrO1D4aKn8F8ky0,1757
@@ -9,7 +9,7 @@ mathai/fraction.py,sha256=44RuEPQ8z2CGhnxFXrHIy4MkgaE4QDtu7-sEV12GWjc,2597
 mathai/integrate.py,sha256=6Ik_uAzkLyOWCE9M7mqwH_SVTvEdiG0-UYS2KsDgjLI,17454
 mathai/inverse.py,sha256=ya7P8WjzfaAL3UXL7xqOh5GaIsXLDZ-F6lZFy3IEgaQ,2931
 mathai/limit.py,sha256=9F8i9UZh2xb-V8A5Sd1gdhDf9c2RFgpE1GdNn9MvbWI,5703
-mathai/linear.py,sha256=36mcYq2mzSidxC2F9gmaMHrXO9vNHYH9kX8CNsopyW8,5145
+mathai/linear.py,sha256=pTo4gXyosUnwG6h5G1zZOMCJPwQaBZyuaeH8XlrBy9o,5219
 mathai/logic.py,sha256=wUenUEcIazQH2jnka43QQ9XpLQgY7x3Rq2QUxzFzf-U,9569
 mathai/matrix.py,sha256=k8gIasxtEF1t_B0mJSbDvUJ3FDddvYI8hhy0FMMQ54k,5416
 mathai/ode.py,sha256=F0Z_Zv2YsnVf4HwIJmqvIenjONaItzy5H739THkLvcU,11616
@@ -22,7 +22,7 @@ mathai/structure.py,sha256=u4usB0yPnem2VscgEBqKWxRN9Y4tTjymEaQh1de5Bsk,4121
 mathai/tool.py,sha256=Wjp8pcBu7MkJr-oAa_bFzKr9mNAB9WrpPISSJd4p-x0,5407
 mathai/trig.py,sha256=tkn6NgfXj5XzjVB261SuX_mx2g3stqNksoco4O6so90,10713
 mathai/univariate_inequality.py,sha256=QoE6lZW_cUXa5sbbvwz88DjAVSY--RZt03w02edCVtA,16375
-mathai-0.8.0.dist-info/METADATA,sha256=RaL-uVubiBKVs7rz5DdcPKe9ri9Ihe0llTv6bA-7ElY,7735
-mathai-0.8.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-mathai-0.8.0.dist-info/top_level.txt,sha256=ROP4l3OhGYw3ihkQGASr18xM9GsK4z3_6whV5AyXLwE,7
-mathai-0.8.0.dist-info/RECORD,,
+mathai-0.8.1.dist-info/METADATA,sha256=v2DpxYv_i3Tpxv1XmcNGSnX5EgLVShvGyRXFVNR5V6o,7735
+mathai-0.8.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+mathai-0.8.1.dist-info/top_level.txt,sha256=ROP4l3OhGYw3ihkQGASr18xM9GsK4z3_6whV5AyXLwE,7
+mathai-0.8.1.dist-info/RECORD,,