mathai 0.5.4__py3-none-any.whl → 0.5.5__py3-none-any.whl

mathai/structure.py

@@ -1,5 +1,5 @@
 import itertools
-from .simplify import solve, simplify
+from .simplify import simplify
 from .base import *
 
 def structure(equation, formula, formula_out=None, only_const=False):
@@ -84,7 +84,7 @@ def transform_formula(equation, wrt, formula_list, var, expr):
                 for j in range(len(expr)):
                     item[i] = replace(item[i], expr[j][0], item2[j])
             for i in range(2):
-                item[i] = solve(item[i])
+                item[i] = simplify(item[i])
             out = None
             p = False
             if var != "":

mathai/tool.py

@@ -1,6 +1,6 @@
 from .diff import diff
 from .expand import expand
-from .simplify import simplify, solve
+from .simplify import simplify
 from .base import *
 import math
 
@@ -159,5 +159,5 @@ def poly(eq, to_compute, m=10):
     final = []
     for index, item in enumerate(out):
         final.append(substitute_val(item, 0, to_compute)/tree_form("d_"+str(math.factorial(index))))
-        
+
     return [expand(simplify(item)) for item in final][::-1]

mathai/trig.py

@@ -1,5 +1,5 @@
 import itertools
-from .simplify import solve, simplify
+from .simplify import simplify
 from .base import *
 from .expand import expand
 from .structure import transform_formula
@@ -49,7 +49,7 @@ def trig0(eq):
                 count += 1
         if count != 1:
             return None
-        eq = solve(product(lst)/tree_form("s_pi"))
+        eq = simplify(product(lst)/tree_form("s_pi"))
         out = frac(eq)
         if out is None or out < 0:
             return None
@@ -99,31 +99,48 @@ def trig0(eq):
             if tuple(out) in trig_cos_table.keys():
                 return trig_cos_table[tuple(out)]
     return TreeNode(eq.name, [trig0(child) for child in eq.children])
+def cog(expr):
+    expr = TreeNode(expr.name, [product_to_sum(child) for child in expr.children])
+    expr = trig0(simplify(expr))
+    expr = expand(simplify(expr))
+    return expr
+def product_to_sum(expr):
+    factors = factor_generation(expr)
+    other = []
+    lst = []
+    for item in factors:
+        if item.name in ["f_cos", "f_sin"]:
+            lst.append(item)
+        else:
+            other.append(item)
+    if len(lst) <= 1:
 
-def product_to_sum(eq):
-    lst = factor_generation(eq)
-    if len(lst) == 1:
-        return lst[0]
+        return dowhile(expr, cog)
     if len(lst) == 2:
         a, b = lst
+        out = None
+        if a.name < b.name:
+            a, b = b, a
+        A, B = a.children[0], b.children[0]
         if a.name == "f_sin" and b.name == "f_sin":
-            return ((a.children[0] - b.children[0]).fx("cos") - (a.children[0] + b.children[0]).fx("cos")) / tree_form("d_2")
+            out =((A - B).fx("cos") - (A + B).fx("cos")) / tree_form("d_2")
         elif a.name == "f_cos" and b.name == "f_cos":
-            return ((a.children[0] - b.children[0]).fx("cos") + (a.children[0] + b.children[0]).fx("cos")) / tree_form("d_2")
+            out =((A - B).fx("cos") + (A + B).fx("cos")) / tree_form("d_2")
         elif a.name == "f_sin" and b.name == "f_cos":
-            return ((a.children[0] + b.children[0]).fx("sin") + (a.children[0] - b.children[0]).fx("sin")) / tree_form("d_2")
-        elif a.name == "f_cos" and b.name == "f_sin":
-            return ((a.children[0] + b.children[0]).fx("sin") - (a.children[0] - b.children[0]).fx("sin")) / tree_form("d_2")
-    first, rest = lst[0], lst[1:]
-    s = tree_form("d_0")
-    eq = expand(simplify(first * product_to_sum(solve(TreeNode("f_mul", rest)))))
-    if eq.name == "f_add":
-        for child in eq.children:
-            s += product_to_sum(child)
-            s = simplify(s)
-    else:
-        s = eq
-    return s
+            out =((A + B).fx("sin") + (A - B).fx("sin")) / tree_form("d_2")
+            
+        return out * product(other)
+
+    rest = tree_form("d_1")
+    if len(lst) % 2 == 1:
+        rest = lst.pop(0)
+    out = []
+    for i in range(0, len(lst), 2):
+        out.append(product_to_sum(product(lst[i:i+2])))
+    expr = product(out)*rest*product(other)
+    
+    return dowhile(expr, cog)
+
 def trig_formula_init():
     var = ""
     formula_list = [(f"A*sin(B)+C*sin(B)", f"(A^2+C^2)^(1/2)*sin(B+arctan(C/A))"),\
@@ -162,11 +179,11 @@ def noneg_pow(eq):
     if eq.name == "f_pow" and frac(eq.children[1]) is not None and frac(eq.children[1])<0:
         return (eq.children[0]**(simplify(-eq.children[1])))**-1
     return TreeNode(eq.name, [noneg_pow(child) for child in eq.children])
-def _trig1(equation):
-    equation = product_to_sum(equation)
-    return TreeNode(equation.name, [_trig1(child) for child in equation.children])
+    
 def trig1(eq):
-    return simplify(_trig1(noneg_pow(eq)))
+    eq = noneg_pow(eq)
+    return product_to_sum(eq)
+
 def trig4(eq):
     done = False
     def _trig4(eq, numer=True, chance="sin"):

mathai/univariate_inequality.py

@@ -3,8 +3,8 @@ import itertools
 from .base import *
 from .inverse import inverse
 from collections import Counter
-from .factor import factor2
-from .simplify import simplify, solve
+#from .factor import factor2
+from .simplify import simplify
 from .expand import expand
 from .fraction import fraction
 import copy
@@ -18,6 +18,7 @@ def intersection2(domain, lst):
         return []
     lst = [item for item in lst if item not in domain]
     out = []
+    
     for item2 in lst:
         for index in range(len(domain)):
             
@@ -180,7 +181,7 @@ def helper(eq, var="v_0"):
     if eq.children[0].name == "f_add":
         
         eq.children[0] = simplify(expand(eq.children[0]))
-        eq = simplify(factor2(eq))
+        #eq = simplify(factor2(eq))
     
         
     equ = False
@@ -198,10 +199,12 @@ def helper(eq, var="v_0"):
     more = []
     
     _, d = num_dem(eq.children[0])
-    d = factor2(d)
+    d = simplify(d)
+    
+    #d = factor2(d)
     
     for item in factor_generation(d):
-        
+         
         item = simplify(expand(item))
         if len(vlist(item)) != 0:
             v = vlist(item)[0]
@@ -210,7 +213,7 @@ def helper(eq, var="v_0"):
             out = inverse(item, vlist(item)[0])
             more.append(simplify(out))
     
-    eq.children[0] = factor2(eq.children[0])
+    #eq.children[0] = factor2(eq.children[0])
     
     for item in factor_generation(eq.children[0]):
         item = simplify(expand(item))
@@ -262,6 +265,7 @@ def helper(eq, var="v_0"):
     equal = list(set([simplify(item) for item in equal]))
     more = list(set([simplify(item) for item in more]))
     critical = [simplify(item) for item in critical]
+    
     critical = Counter(critical)
     
     critical = sorted(critical.items(), key=lambda x: compute(x[0]))
@@ -277,7 +281,6 @@ def helper(eq, var="v_0"):
         critical[i] = critical[i][0]
 
     
-    
     if eq.name == "f_eq":
         final = Range([False], equal, more)
         dic_table[eq2] = final
@@ -392,7 +395,7 @@ def handle_sqrt(eq):
         return out
     return TreeNode("f_and", [helper2(eq)]+d)
 def domain(eq):
-    eq = solve(eq, True)
+    eq = simplify(eq)
     out = []
     def helper2(eq):
         nonlocal out

{mathai-0.5.4.dist-info → mathai-0.5.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mathai
-Version: 0.5.4
+Version: 0.5.5
 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.5.5.dist-info/RECORD

@@ -0,0 +1,27 @@
+mathai/__init__.py,sha256=fS2JF5cF02nWEw_GwqT7VzXpTP1YJe4WPD7ScFhNWTU,1542
+mathai/apart.py,sha256=VSS3khE9PNuxiRvdU5JDl4IN-KJBSIFjwR17pkhviXI,4197
+mathai/base.py,sha256=mc_uvjdVBbTMMrusMEUgYBrrpY1DMNXcaftuf-EUTT4,14158
+mathai/bivariate_inequality.py,sha256=FJOC2zKU5zWCMybCrhEQ7nVDgRO_w19Zko8WPTaDTSo,11411
+mathai/console.py,sha256=Sn58iwYE79MLEh67s8X3q6vZjw6g7f9XM1T8_dBBR2o,3048
+mathai/diff.py,sha256=RSTwlfeddvYXUDShCeRdcPjsmAS8Vf5OkYJAaUBPaiM,3060
+mathai/expand.py,sha256=chf5Ht6jLWNZl_RB_hziI7u_ZwsRtCGWJropt88dPA4,5474
+mathai/factor.py,sha256=WZqwLJwpDnkgYiUtmX4OPwcLg87--l_naUA39Lctfik,12513
+mathai/fraction.py,sha256=88xvRpDGfFi8tbe1QIyejdSP91HcErrN4VS2MxzbhrY,4392
+mathai/integrate.py,sha256=AqNp6DeQOQJUCbIcRo5Y36r5zjIhHUYDAj-_RkRrEJE,17202
+mathai/inverse.py,sha256=ya7P8WjzfaAL3UXL7xqOh5GaIsXLDZ-F6lZFy3IEgaQ,2931
+mathai/limit.py,sha256=9F8i9UZh2xb-V8A5Sd1gdhDf9c2RFgpE1GdNn9MvbWI,5703
+mathai/linear.py,sha256=viGlPU8BPrjLWHlyNUvnfPHNH5d4ZBImiQMdyXaKGg0,5702
+mathai/logic.py,sha256=Ndz4Fd6aNCmzFlqoPyyIpSmV_BXmYHsurePjLyZJoNc,9809
+mathai/matrix.py,sha256=dWIXF5oInIL3SZ3naRzKN5ElI5drXJNiVTDM48hfZOw,972
+mathai/ode.py,sha256=zxxTXAOpt7oSsfpgI4vHsCWKXevmM96ZOBZWWs-vj8Y,4801
+mathai/parser.py,sha256=K6O5TR1PGl9LbSdGpcbwiwQva8r5-SwZ5fSp84oA8co,7025
+mathai/printeq.py,sha256=MKsR6-qXig80R07vLnFPYHQMeS41FrMVj3n3arrhJpQ,1329
+mathai/simplify.py,sha256=sI3Hw7pEFZrUZx5J8wZxwJbSZ2CBFcTrTHELW4kbpKg,19418
+mathai/structure.py,sha256=wrU7kqphSN7CqaVffyHHXD2-3t5My_Z_TtYFoUe_lTU,4099
+mathai/tool.py,sha256=ozcXTXLbKUnyPM9r9kz9M43YA2CBcWezcqLZfEs8rpc,6051
+mathai/trig.py,sha256=fnBbfiopcQzFg4ya1BoO5M0X_aCBnse2bjnKh1juw4I,11223
+mathai/univariate_inequality.py,sha256=WXp-vpAUDjQYwBupQ7M_a-Z9lFcoMlhlX45DRDVyDs8,15088
+mathai-0.5.5.dist-info/METADATA,sha256=Jn1tgXWspkEK7pCQNL_AX5qE9D8z578TwVVdZd652lA,7103
+mathai-0.5.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mathai-0.5.5.dist-info/top_level.txt,sha256=ROP4l3OhGYw3ihkQGASr18xM9GsK4z3_6whV5AyXLwE,7
+mathai-0.5.5.dist-info/RECORD,,

mathai-0.5.4.dist-info/RECORD

@@ -1,27 +0,0 @@
-mathai/__init__.py,sha256=LNmGQztU8xBh7mjgbPemQZKRXythLwif56rDv3ksjs4,1539
-mathai/apart.py,sha256=VSS3khE9PNuxiRvdU5JDl4IN-KJBSIFjwR17pkhviXI,4197
-mathai/base.py,sha256=pduS0fRpFZR8O-MP-7lDuq1dU603mwfDpmBcT2FyJgI,12793
-mathai/bivariate_inequality.py,sha256=FJOC2zKU5zWCMybCrhEQ7nVDgRO_w19Zko8WPTaDTSo,11411
-mathai/console.py,sha256=Sn58iwYE79MLEh67s8X3q6vZjw6g7f9XM1T8_dBBR2o,3048
-mathai/diff.py,sha256=YUBpRsz0qmBkq5vGxeGnvR4nMKjdOQiIXlNMxpij2ns,3051
-mathai/expand.py,sha256=SnBltkpIENMGkP0AYmbMlSc4H-CF5RslO2PcBEkn1BQ,3359
-mathai/factor.py,sha256=muPDOcClrqc2XyVlbyIrhiIqI0QxauYL3e2mq3qa6OI,11533
-mathai/fraction.py,sha256=Q2ztsh5Bpz6YhML2QU0tfufbAs0Q6J319AhlzKephIY,4396
-mathai/integrate.py,sha256=LMj7om6vTGbYiUwqN-y11fiD4YR_XMbL33AWgI2893o,16982
-mathai/inverse.py,sha256=QCvDrzKquWsZv-BDAzZd9HnU0c3gZvcc44UztHVO5LQ,2919
-mathai/limit.py,sha256=DoTBMGdbc47WPN2yo6XwES6Gc-GDDArDhF5uyDFPSC4,5710
-mathai/linear.py,sha256=Mmmnn4IdnADRMuv6crB0a_Ba2drGUFXOh7eqIIkirYA,5709
-mathai/logic.py,sha256=UvHzRmKcO9AD51tRzHmpNSEhgW5gmaf4XPaQKFjGfC4,9653
-mathai/matrix.py,sha256=dWIXF5oInIL3SZ3naRzKN5ElI5drXJNiVTDM48hfZOw,972
-mathai/ode.py,sha256=zxxTXAOpt7oSsfpgI4vHsCWKXevmM96ZOBZWWs-vj8Y,4801
-mathai/parser.py,sha256=K6O5TR1PGl9LbSdGpcbwiwQva8r5-SwZ5fSp84oA8co,7025
-mathai/printeq.py,sha256=gIes-pstFOa6FcnpVIVvkjVKuWdsVdo11LlEnmHhakU,1303
-mathai/simplify.py,sha256=4-7yps_I_OQBd8NthF96H0R-ofA3cFSxgM4wDE45OvU,17217
-mathai/structure.py,sha256=4Ww2IAx62RcQSO7_17TZES-DjMWBpcFQtL939FBIHwY,4103
-mathai/tool.py,sha256=r8ejBY4Bnk_t8USYQCuxwmmJ4M-5H5OR6A3VbV7W-5w,6066
-mathai/trig.py,sha256=BQd_Gl_u0g5ZuZIwKozuXKbMinqb6K-OYicrtftn7eg,11174
-mathai/univariate_inequality.py,sha256=3Yr7d9mE-mUNkwOPQyFPBDp0-gKkqrpzEYeHFQ8JcXA,15060
-mathai-0.5.4.dist-info/METADATA,sha256=WIcw95PJtFwsEyhCKVJJuNpQLUlROTfErTRC76nqUX8,7103
-mathai-0.5.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mathai-0.5.4.dist-info/top_level.txt,sha256=ROP4l3OhGYw3ihkQGASr18xM9GsK4z3_6whV5AyXLwE,7
-mathai-0.5.4.dist-info/RECORD,,