mathai 0.2.9__py3-none-any.whl → 0.3.0__py3-none-any.whl

mathai/__init__.py

@@ -1,16 +1,16 @@
-from .expand import expand
-from .parser import parse
-from .printeq import printeq, printeq_log, printeq_str
-from .simplify import solve, simplify, solve2
-from .integrate import integrate, sqint, byparts
-from .diff import diff
-from .factor import factor, factor2
-from .fraction import fraction
-from .inverse import inverse
-from .trig import trig0, trig1, trig2, trig3, trig4
-from .logic import logic0, logic1, logic2, logic3
-from .apart import apart
-from .console import console
-from .limit import limit
-from .univariate_inequality import wavycurvy, absolute, domain, handle_sqrt
-from .base import *
+from .expand import expand
+from .parser import parse
+from .printeq import printeq, printeq_log, printeq_str
+from .simplify import solve, simplify, solve2
+from .integrate import integrate, sqint, byparts
+from .diff import diff
+from .factor import factor, factor2
+from .fraction import fraction
+from .inverse import inverse
+from .trig import trig0, trig1, trig2, trig3, trig4
+from .logic import logic0, logic1, logic2, logic3
+from .apart import apart
+from .console import console
+from .limit import limit
+from .univariate_inequality import wavycurvy, absolute, domain, handle_sqrt
+from .base import *

mathai/apart.py

@@ -1,103 +1,103 @@
-from .linear import linear_solve
-from .expand import expand
-from .simplify import simplify
-from .diff import diff
-from .inverse import inverse
-from .base import *
-import math
-from .tool import poly
-
-def apart(eq, v="v_0"):
-    eq = simplify(eq)
-    if eq.name != "f_mul":
-        return eq
-    if any("f_"+item in str_form(eq) for item in "sin cos tan log".split(" ")):
-        return eq
-    def exclude(eq):
-        if eq.name == "f_pow" and eq.children[1].name[:2] != "d_":
-            return False
-        if any(not exclude(child) for child in eq.children):
-            return False
-        return True
-    
-    if not exclude(eq):
-        return eq
-    
-    def countfac(lst, eq):
-        count=0
-        for item in lst:
-            if simplify(expand(simplify(eq - item))) == tree_form("d_0"):
-                count += 1
-        return tree_form("d_"+str(count))
-    
-    alloclst = []
-    for i in range(0,26):
-        if "v_"+str(i) not in vlist(eq):
-            alloclst.append(tree_form("v_"+str(i)))
-    
-    nn, d = num_dem(eq)
-    
-    s = []
-    facd = [simplify(x) for x in factor_generation(simplify(d))]
-    
-     
-    facd2 = remove_duplicates_custom(facd, lambda m, n: simplify(m-n) == tree_form("d_0"))
-    if len(facd2) == 1:
-        return eq
-    x = tree_form(v)
-    num = []
-    dem = []
-    for item in facd2:
-        
-        g = countfac(facd, item)
-        for n in range(int(g.name[2:])):
-            n = n+1
-            if n > 2:
-                return eq
-            n = tree_form("d_"+str(n))
-            l = len(poly(item, v))
-            if l == 3:
-                a = alloclst.pop(0)
-                b = alloclst.pop(0)
-                if n == tree_form("d_1"):
-                    num.append(a*x+ b)
-                    dem.append(item)
-                    s.append((a*x+ b)/item)
-                else:
-                    num.append(a*x+ b)
-                    dem.append(item**n)
-                    s.append((a*x+ b)/item**n)
-            elif l == 2:
-                a = alloclst.pop(0)
-                if n == tree_form("d_1"):
-                    num.append(a)
-                    dem.append(item)
-                    s.append(a/item)
-                else:
-                    num.append(a)
-                    dem.append(item**n)
-                    s.append(a/item**n)
-            else:
-                return eq
-    final3 = summation(s)
-    
-    eq2 = simplify(nn*product(dem)/d)
-    
-    final2 = []
-    for i in range(len(num)):
-        final2.append(product([dem[k] for k in range(len(dem)) if i != k])*num[i])
-
-    final = summation(final2)
-   
-    s = simplify(TreeNode("f_eq", [final-eq2, tree_form("d_0")]))
-    
-    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)]
-   
-    out = linear_solve(TreeNode("f_and", lst))
-    
-    for item in out.children:
-        
-        final3 = replace(final3, tree_form(vlist(item)[0]), inverse(item.children[0], vlist(item)[0]))
-    return simplify(final3)
+from .linear import linear_solve
+from .expand import expand
+from .simplify import simplify
+from .diff import diff
+from .inverse import inverse
+from .base import *
+import math
+from .tool import poly
+
+def apart(eq, v="v_0"):
+    eq = simplify(eq)
+    if eq.name != "f_mul":
+        return eq
+    if any("f_"+item in str_form(eq) for item in "sin cos tan log".split(" ")):
+        return eq
+    def exclude(eq):
+        if eq.name == "f_pow" and eq.children[1].name[:2] != "d_":
+            return False
+        if any(not exclude(child) for child in eq.children):
+            return False
+        return True
+    
+    if not exclude(eq):
+        return eq
+    
+    def countfac(lst, eq):
+        count=0
+        for item in lst:
+            if simplify(expand(simplify(eq - item))) == tree_form("d_0"):
+                count += 1
+        return tree_form("d_"+str(count))
+    
+    alloclst = []
+    for i in range(0,26):
+        if "v_"+str(i) not in vlist(eq):
+            alloclst.append(tree_form("v_"+str(i)))
+    
+    nn, d = num_dem(eq)
+    
+    s = []
+    facd = [simplify(x) for x in factor_generation(simplify(d))]
+    
+     
+    facd2 = remove_duplicates_custom(facd, lambda m, n: simplify(m-n) == tree_form("d_0"))
+    if len(facd2) == 1:
+        return eq
+    x = tree_form(v)
+    num = []
+    dem = []
+    for item in facd2:
+        
+        g = countfac(facd, item)
+        for n in range(int(g.name[2:])):
+            n = n+1
+            if n > 2:
+                return eq
+            n = tree_form("d_"+str(n))
+            l = len(poly(item, v))
+            if l == 3:
+                a = alloclst.pop(0)
+                b = alloclst.pop(0)
+                if n == tree_form("d_1"):
+                    num.append(a*x+ b)
+                    dem.append(item)
+                    s.append((a*x+ b)/item)
+                else:
+                    num.append(a*x+ b)
+                    dem.append(item**n)
+                    s.append((a*x+ b)/item**n)
+            elif l == 2:
+                a = alloclst.pop(0)
+                if n == tree_form("d_1"):
+                    num.append(a)
+                    dem.append(item)
+                    s.append(a/item)
+                else:
+                    num.append(a)
+                    dem.append(item**n)
+                    s.append(a/item**n)
+            else:
+                return eq
+    final3 = summation(s)
+    
+    eq2 = simplify(nn*product(dem)/d)
+    
+    final2 = []
+    for i in range(len(num)):
+        final2.append(product([dem[k] for k in range(len(dem)) if i != k])*num[i])
+
+    final = summation(final2)
+   
+    s = simplify(TreeNode("f_eq", [final-eq2, tree_form("d_0")]))
+    
+    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)]
+   
+    out = linear_solve(TreeNode("f_and", lst))
+    
+    for item in out.children:
+        
+        final3 = replace(final3, tree_form(vlist(item)[0]), inverse(item.children[0], vlist(item)[0]))
+    return simplify(final3)