mathai 0.4.6__tar.gz → 0.4.7__tar.gz

{mathai-0.4.6 → mathai-0.4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mathai
-Version: 0.4.6
+Version: 0.4.7
 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.4.6 → mathai-0.4.7}/mathai/__init__.py

@@ -1,6 +1,8 @@
 from .ode import diffsolve as ode_solve
 from .ode import diffsolve_sep as ode_shift_term
 
+from .linear import linear_solve
+
 from .expand import expand
 
 from .parser import parse

{mathai-0.4.6 → mathai-0.4.7}/mathai/factor.py

@@ -5,6 +5,7 @@ from .base import *
 from .simplify import simplify,solve
 from .expand import expand
 import math
+from .tool import poly
 
 from collections import Counter
 def multiset_intersection(*lists):
@@ -158,12 +159,6 @@ def rationalize_sqrt(eq):
     return TreeNode(eq.name, [rationalize_sqrt(child) for child in eq.children])
 def factorconst(eq):
     return simplify(_factorconst(eq))
-def factor_quad_formula_init():
-    var = ""
-    formula_list = [(f"(A*D^2+B*D+C)", f"A*(D-(-B+(B^2-4*A*C)^(1/2))/(2*A))*(D-(-B-(B^2-4*A*C)^(1/2))/(2*A))")]
-    formula_list = [[simplify(parse(y)) for y in x] for x in formula_list]
-    expr = [[parse("A"), parse("1")], [parse("B"), parse("0"), parse("1")], [parse("C"), parse("0")]]
-    return [formula_list, var, expr]
 
 def factor_quar_formula_init():
     var = ""
@@ -171,44 +166,103 @@ def factor_quar_formula_init():
     formula_list = [[simplify(parse(y)) for y in x] for x in formula_list]
     expr = [[parse("A")], [parse("B"), parse("0"), parse("1")], [parse("C"), parse("0")]]
     return [formula_list, var, expr]
-def factor_cube_formula_init():
-    var = ""
-    formula_list = [(f"D^3+E", f"(D+E^(1/3))*(D^2-D*E^(1/3)+E^(2/3))"), (f"D^3-E", f"(D-E^(1/3))*(D^2+D*E^(1/3)+E^(2/3))"),\
-                    (f"-D^3+E", f"(-D+E^(1/3))*(D^2+D*E^(1/3)+E^(2/3))")]
-    formula_list = [[simplify(parse(y)) for y in x] for x in formula_list]
-    expr = [[parse("A")], [parse("B")]]
-    return [formula_list, var, expr]
-formula_gen2 = factor_quad_formula_init()
-formula_gen3 = factor_cube_formula_init()
+
 formula_gen9 = factor_quar_formula_init()
 def factor_helper(equation, complexnum, power=2):
-    global formula_gen2, formula_gen3, formula_gen9
-    maxnum = 1
+    global formula_gen9
+    
+    maxnum=1
+    alloclst = []
+    for i in range(0,26):
+        if "v_"+str(i) not in vlist(equation):
+            alloclst.append("v_"+str(i))
+    r = alloclst.pop(0)
+    fx = None
+    curr = None
     def high(eq):
         nonlocal maxnum
         if eq.name == "f_pow" and eq.children[1].name[:2] == "d_":
             n = int(eq.children[1].name[2:])
-            if n>power and n % power == 0:
-                 maxnum = max(maxnum, n)
+            if abs(n)>power and abs(n) % power == 0:
+                if abs(n)>abs(maxnum):
+                    maxnum = n
         for child in eq.children:
             high(child)
     def helper(eq):
-        nonlocal maxnum
+        nonlocal maxnum, fx, r
         if eq.name == "f_pow" and eq.children[1].name[:2] == "d_":
             n = int(eq.children[1].name[2:])
-            sgn = round(abs(n)/n)
-            n = abs(n)
-            if n>power and n % power == 0 and maxnum==n:
-                out= (eq.children[0]**tree_form("d_"+str(sgn*int(n/power))))**power
+            if maxnum !=1 and n % maxnum == 0:
+                fx = lambda x: replace(x, tree_form(r), curr**tree_form("d_"+str(maxnum)))
+                out= tree_form(r)**tree_form("d_"+str(int(n/maxnum)))
                 return out
         return TreeNode(eq.name, [helper(child) for child in eq.children])
-    high(equation)
     out = None
-    if power == 2:
-        out = transform_formula(helper(equation), "v_0", formula_gen2[0], formula_gen2[1], formula_gen2[2])
-    elif power == 3:
-        out = transform_formula(helper(equation), "v_0", formula_gen3[0], formula_gen3[1], formula_gen3[2])
-    elif power == 4:
+    for i in range(2,4):
+        if power == i:
+            for curr in vlist(equation):
+                curr = tree_form(curr)
+                fx = None
+                maxnum = 1
+                high(equation)
+                
+                if maxnum != 1:
+                    maxnum= maxnum/power
+                    maxnum = round(maxnum)
+                eq2 = helper(equation)
+                if not contain(eq2, tree_form(r)) or (contain(eq2, tree_form(r)) and not contain(eq2,curr)):
+                    if not contain(eq2, tree_form(r)):
+                        r = curr.name
+                        fx = lambda x: x
+                        
+                    lst = poly(eq2.copy_tree(), r)
+                    if lst is not None and len(lst)==i+1:
+                        
+                        success = True
+                        if i == 2:
+                            a, b, c = lst
+                            x1 = (-b+(b**2 - 4*a*c)**(tree_form("d_2")**-1))/(2*a)
+                            x2 = (-b-(b**2 - 4*a*c)**(tree_form("d_2")**-1))/(2*a)
+                            x1 = simplify(x1)
+                            x2 = simplify(x2)
+                            eq2 = a*(tree_form(r)-x1)*(tree_form(r)-x2)
+                            if not complexnum and (contain(x1, tree_form("s_i")) or contain(x2, tree_form("s_i"))):
+                                success = False
+                        else:
+                            a, b, c, d = lst
+                            B, C, D =  b/a, c/a, d/a
+                            p = C-(B**2)/3
+                            q = 2*B**3/27-B*C/3+D
+                            t = q**2/4+ p**3/27
+                            u = (-q/2+t**(tree_form("d_2")**-1))**(tree_form("d_3")**-1)
+                            v = (-q/2-t**(tree_form("d_2")**-1))**(tree_form("d_3")**-1)
+                            y1 = u+v
+                            three = 3**(tree_form("d_2")**-1)
+                            y2 = -(u+v)/2+tree_form("s_i")*three*(u-v)/2
+                            y3 = -(u+v)/2-tree_form("s_i")*three*(u-v)/2
+                            x1,x2,x3 = y1-B/3 , y2-B/3, y3-B/3
+                            x1,x2, x3 = simplify(x1), simplify(x2), simplify(x3)
+                            out2 = None
+                            if not complexnum:
+                                for item in itertools.combinations([x1,x2,x3],2):
+                                    if all(contain(item2,tree_form("s_i")) for item2 in list(item)):
+                                        out2 = (tree_form(r)-item[0])*(tree_form(r)-item[1])
+                                        break
+                            if out2 is not None:
+                                out2 = simplify(expand(simplify(out2)))
+                                out3 = None
+                                for item in [x1, x2, x3]:
+                                    if not contain(item,tree_form("s_i")):
+                                        out3 = item
+                                        break
+                                eq2 = a*(tree_form(r)-out3)*out2
+                                
+                            else:
+                                eq2 = a*(tree_form(r)-x1)*(tree_form(r)-x2)*(tree_form(r)-x3)
+                        if success:
+                            equation = fx(eq2)
+                            break
+    if power == 4:
         out = transform_formula(helper(equation), "v_0", formula_gen9[0], formula_gen9[1], formula_gen9[2])
     if out is not None:
         out = simplify(solve(out))

{mathai-0.4.6 → mathai-0.4.7}/mathai/simplify.py

@@ -287,7 +287,9 @@ def simplify(eq):
                 error = True
             else:
                 eq = tree_form("d_0")
-        
+        if eq.name =="f_pow" and eq.children[0] == tree_form("s_i") and frac(eq.children[1])is not None and frac(eq.children[1]).denominator == 1:
+            n = frac(eq.children[1]).numerator
+            eq = {0:tree_form("d_1"), 1:tree_form("s_i"), 2:tree_form("d_-1"), 3:-tree_form("s_i")}[n%4]
         if eq.name == "f_mul":
             dic = {}
             for child in eq.children:

{mathai-0.4.6 → mathai-0.4.7}/mathai/tool.py

@@ -36,7 +36,12 @@ def poly(eq, to_compute):
         eq = replace(eq, tree_form(var), tree_form("d_"+str(val)))
         return eq
     def inv(eq):
-        if eq.name == "f_pow" and "v_" in str_form(eq.children[0]) and eq.children[1] == tree_form("d_-1"):
+        if eq.name =="f_eq":
+            return False
+        if eq.name[2:] in ["sin", "cos", "log"] and contain(eq.children[0], tree_form(to_compute)):
+            return False
+        if eq.name == "f_pow" and contain(eq.children[0], tree_form(to_compute)) and\
+           (frac(eq.children[1]) is None or frac(eq.children[1]) < 0 or frac(eq.children[1]).denominator != 1):
             return False
         if eq.name == "f_abs":
             return False
@@ -47,7 +52,7 @@ def poly(eq, to_compute):
         return None
     out = []
     eq2 = eq
-    for i in range(10):
+    for i in range(8):
         out.append(expand(simplify(eq2)))
         eq2 = diff(eq2, to_compute)
     for i in range(len(out)-1,-1,-1):

{mathai-0.4.6 → mathai-0.4.7}/mathai/trig.py

@@ -58,6 +58,9 @@ def trig0(eq):
         if a > b:       
             a = 2*b - a
         return a, b
+    if eq.name == "f_arccosec":
+        return (1/eq.children[0]).fx("arcsin")
+    
     if eq.name == "f_arctan":
         if eq.children[0].name == "d_0":
             return tree_form("d_0")
@@ -164,52 +167,59 @@ def _trig1(equation):
     return TreeNode(equation.name, [_trig1(child) for child in equation.children])
 def trig1(eq):
     return simplify(_trig1(noneg_pow(eq)))
-    
-def trig4(eq, numer=True):
-    if eq.name == "f_sin":
-        if eq.children[0].name == "f_add" and len(eq.children[0].children)>=2:
-            r = len(eq.children[0].children)%2
-            a, b = TreeNode("f_add", eq.children[0].children[:round((len(eq.children[0].children)-r)/2)]),\
-                   TreeNode("f_add", eq.children[0].children[round((len(eq.children[0].children)-r)/2):])
-            if len(a.children)==1:
-                a=a.children[0]
-            if len(b.children)==1:
-                b=b.children[0]
-            return a.fx("sin")*b.fx("cos") + a.fx("cos")*b.fx("sin")
-        if eq.children[0].name == "f_arccos":
-            a = eq.children[0].children[0]
-            return (1-a**2)**(tree_form("d_2")**-1)
-        if eq.children[0].name == "f_arctan":
-            a = eq.children[0].children[0]
-            return a/(1+a**2)**(tree_form("d_2")**-1)
-    if eq.name == "f_pow" and numer:
-        if eq.children[0].name == "f_cos":
-            a = eq.children[0].children[0]
-            if frac(eq.children[1]) == 2:
-                return 1 - a.fx("sin")**2
-        if eq.children[0].name == "f_sin":
-            a = eq.children[0].children[0]
-            if frac(eq.children[1]) == 2:
-                return 1 - a.fx("cos")**2
-    if eq.name == "f_cos":
-        if eq.children[0].name == "f_add" and len(eq.children[0].children)>=2:
-            r = len(eq.children[0].children)%2
-            a, b = TreeNode("f_add", eq.children[0].children[:round((len(eq.children[0].children)-r)/2)]),\
-                   TreeNode("f_add", eq.children[0].children[round((len(eq.children[0].children)-r)/2):])
-            if len(a.children)==1:
-                a=a.children[0]
-            if len(b.children)==1:
-                b=b.children[0]
-            return a.fx("cos")*b.fx("cos") - a.fx("sin")*b.fx("sin")
-        if eq.children[0].name == "f_arcsin":
-            a = eq.children[0].children[0]
-            return (1-a**2)**(tree_form("d_2")**-1)
-        if eq.children[0].name == "f_arctan":
-            a = eq.children[0].children[0]
-            return tree_form("d_1")/(1+a**2)**(tree_form("d_2")**-1)
-    
-    return TreeNode(eq.name, [trig4(child, False) if not numer or (eq.name == "f_pow" and frac(eq.children[1]) is not None and frac(eq.children[1]) < 0) else trig4(child, True) for child in eq.children])
-
+def trig4(eq):
+    done = False
+    def _trig4(eq, numer=True, chance="sin"):
+        nonlocal done
+        if eq.name == "f_sin":
+            if eq.children[0].name == "f_add" and len(eq.children[0].children)>=2:
+                r = len(eq.children[0].children)%2
+                a, b = TreeNode("f_add", eq.children[0].children[:round((len(eq.children[0].children)-r)/2)]),\
+                       TreeNode("f_add", eq.children[0].children[round((len(eq.children[0].children)-r)/2):])
+                if len(a.children)==1:
+                    a=a.children[0]
+                if len(b.children)==1:
+                    b=b.children[0]
+                return a.fx("sin")*b.fx("cos") + a.fx("cos")*b.fx("sin")
+            if eq.children[0].name == "f_arccos":
+                a = eq.children[0].children[0]
+                return (1-a**2)**(tree_form("d_2")**-1)
+            if eq.children[0].name == "f_arctan":
+                a = eq.children[0].children[0]
+                return a/(1+a**2)**(tree_form("d_2")**-1)
+        if eq.name == "f_pow" and numer:
+            if eq.children[0].name == "f_cos" and chance == "cos":
+                a = eq.children[0].children[0]
+                if frac(eq.children[1]) == 2:
+                    done = True
+                    return 1 - a.fx("sin")**2
+            if eq.children[0].name == "f_sin" and chance == "cos":
+                a = eq.children[0].children[0]
+                if frac(eq.children[1]) == 2:
+                    done = True
+                    return 1 - a.fx("cos")**2
+        if eq.name == "f_cos":
+            if eq.children[0].name == "f_add" and len(eq.children[0].children)>=2:
+                r = len(eq.children[0].children)%2
+                a, b = TreeNode("f_add", eq.children[0].children[:round((len(eq.children[0].children)-r)/2)]),\
+                       TreeNode("f_add", eq.children[0].children[round((len(eq.children[0].children)-r)/2):])
+                if len(a.children)==1:
+                    a=a.children[0]
+                if len(b.children)==1:
+                    b=b.children[0]
+                return a.fx("cos")*b.fx("cos") - a.fx("sin")*b.fx("sin")
+            if eq.children[0].name == "f_arcsin":
+                a = eq.children[0].children[0]
+                return (1-a**2)**(tree_form("d_2")**-1)
+            if eq.children[0].name == "f_arctan":
+                a = eq.children[0].children[0]
+                return tree_form("d_1")/(1+a**2)**(tree_form("d_2")**-1)
+        
+        return TreeNode(eq.name, [_trig4(child, False, chance) if not numer or (eq.name == "f_pow" and frac(eq.children[1]) is not None and frac(eq.children[1]) < 0) else _trig4(child, True, chance) for child in eq.children])
+    eq= _trig4(eq)
+    if not done:
+        eq = _trig4(eq,"cos")
+    return eq
 def trig2(eq):
     # Base case: if not an addition, recurse into children
     if eq.name != "f_add":

{mathai-0.4.6 → mathai-0.4.7}/mathai.egg-info/PKG-INFO

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

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