mathai 0.3.5__py3-none-any.whl → 0.3.7__py3-none-any.whl

mathai/integrate.py

@@ -104,8 +104,6 @@ def handle_try(eq):
     else:
         return TreeNode(eq.name, [handle_try(child) for child in eq.children])
 def inteq(eq):
-    if "f_ref" not in str_form(eq):
-        return eq
     if eq.name == "f_try":
         eq2 = None
         output = []
@@ -113,13 +111,19 @@ def inteq(eq):
             if child.name == "f_ref":
                 eq2 = child.children[0]
                 break
+        if eq2 is None:
+            return eq
         for child in eq.children:
             if child.name == "f_ref":
                 output.append(child)
             else:
                 eq3 = simplify(expand(simplify(eq2 - child)))
                 if contain(eq3, eq2):
-                    output.append(inverse(eq3, str_form(eq2)))
+                    out = inverse(eq3, str_form(eq2))
+                    if out is None:
+                        output.append(child)
+                    else:
+                        output.append(out)
                 else:
                     output.append(child)
         return TreeNode("f_try", output)
@@ -134,7 +138,8 @@ def solve_integrate(eq):
     eq2 = dowhile(eq, _solve_integrate)
     eq2 = dowhile(eq2, handle_try)
     eq2 = rm(eq2)
-    eq2.children = list(set(eq2.children))
+    if eq2.name == "f_try":
+        eq2.children = list(set(eq2.children))
     return eq2
 def integrate_subs(equation, term, v1, v2):
     output = []
@@ -385,16 +390,18 @@ def integrate_formula(equation):
         integrand = eq2.children[0]
         wrt = eq2.children[1]
         if integrand == wrt:
-            return TreeNode("f_add", [TreeNode("f_power", [wrt.copy_tree(), TreeNode("2")]), TreeNode("f_div", [TreeNode("1"), TreeNode("2")])])  # x^2/2
+            return wrt**2/2  # x^2/2
         if not contain(integrand, wrt):
-            return TreeNode("f_mul", [wrt.copy_tree(), integrand.copy_tree()])  # constant * dx
+            return integrand*wrt
         out = transform_formula(simplify(trig0(integrand)), wrt.name, formula_gen[0], formula_gen[1], formula_gen[2])
         if out is not None:
+            
             return out
         expr_str = str_form(integrand)
         if expr_str.count("f_sin") + expr_str.count("f_cos") > 2:
             out = transform_formula(integrand, wrt.name, formula_gen4[0], formula_gen4[1], formula_gen4[2])
             if out is not None:
+                
                 return out
     return TreeNode(eq2.name, [integrate_formula(child) for child in eq2.children])
 

{mathai-0.3.5.dist-info → mathai-0.3.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mathai
-Version: 0.3.5
+Version: 0.3.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.3.5.dist-info → mathai-0.3.7.dist-info}/RECORD

@@ -6,7 +6,7 @@ mathai/diff.py,sha256=YUBpRsz0qmBkq5vGxeGnvR4nMKjdOQiIXlNMxpij2ns,3051
 mathai/expand.py,sha256=SnBltkpIENMGkP0AYmbMlSc4H-CF5RslO2PcBEkn1BQ,3359
 mathai/factor.py,sha256=NPXxET52TacNExuvw6p1jbC6g3wY6_VOCdlGlexXZio,5916
 mathai/fraction.py,sha256=Q2ztsh5Bpz6YhML2QU0tfufbAs0Q6J319AhlzKephIY,4396
-mathai/integrate.py,sha256=1E6Uv0f6aqQHB1vmrgvhApw2vtb13upThOKptk891LA,15002
+mathai/integrate.py,sha256=8IPtDHCqoS0zIPT3ssOkcgoH54y2pnzMZUhjVFqYuW4,15024
 mathai/inverse.py,sha256=QCvDrzKquWsZv-BDAzZd9HnU0c3gZvcc44UztHVO5LQ,2919
 mathai/limit.py,sha256=RA8YAehgYCGVWv9qBc8uQ34BQ9mFthWl2OrVTwcHl2g,4920
 mathai/linear.py,sha256=wyiLpIxRDmD96xXktkgvc5gegIB3zblLB1EuV3TFdmU,5474
@@ -19,7 +19,7 @@ mathai/structure.py,sha256=4Ww2IAx62RcQSO7_17TZES-DjMWBpcFQtL939FBIHwY,4103
 mathai/tool.py,sha256=UyccamiJy_CkFPakfufyPzdhtlEO6v2D7qwbXQ9V7Rg,2000
 mathai/trig.py,sha256=5P0RNS4eetNds2l-wyA4BAKqJdFIUws_8RGS_dH7gp8,9348
 mathai/univariate_inequality.py,sha256=_r-kkiS4Hr-jRN7f-EL_E4svAMFWJP1Ea50HJKKbjfk,14778
-mathai-0.3.5.dist-info/METADATA,sha256=fKwgikKrsCYSz8fRhFqIOJY71JITj1PLuFgM_GEKpFY,7021
-mathai-0.3.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mathai-0.3.5.dist-info/top_level.txt,sha256=ROP4l3OhGYw3ihkQGASr18xM9GsK4z3_6whV5AyXLwE,7
-mathai-0.3.5.dist-info/RECORD,,
+mathai-0.3.7.dist-info/METADATA,sha256=FDULZSw1CmA66jzn0svcz_YlrQEk_yRV6uB4rGBB7kk,7021
+mathai-0.3.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mathai-0.3.7.dist-info/top_level.txt,sha256=ROP4l3OhGYw3ihkQGASr18xM9GsK4z3_6whV5AyXLwE,7
+mathai-0.3.7.dist-info/RECORD,,