mathai 0.3.8__tar.gz → 0.4.0__tar.gz

{mathai-0.3.8 → mathai-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mathai
-Version: 0.3.8
+Version: 0.4.0
 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.8 → mathai-0.4.0}/mathai/apart.py

@@ -108,5 +108,6 @@ def _apart(eq, v="v_0"):
     return simplify(final3)
 def apart(eq):
     eq, fx = enclose_const(eq)
+    
     eq = _apart(eq)
     return fx(eq)

{mathai-0.3.8 → mathai-0.4.0}/mathai/base.py

@@ -131,8 +131,6 @@ def frac(eq):
         return Fraction(int(eq.name[2:]))
     if eq.name == "f_add":
         p = frac(eq.children[0])
-        if p is None:
-            return None
         for child in eq.children[1:]:
             tmp = frac(child)
             if isinstance(tmp, Fraction):
@@ -142,8 +140,6 @@ def frac(eq):
         return p
     if eq.name == "f_mul":
         p = frac(eq.children[0])
-        if p is None:
-            return None
         for child in eq.children[1:]:
             tmp = frac(child)
             if isinstance(tmp, Fraction):

{mathai-0.3.8 → mathai-0.4.0}/mathai/integrate.py

@@ -104,6 +104,8 @@ 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 = []
@@ -111,19 +113,13 @@ 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):
-                    out = inverse(eq3, str_form(eq2))
-                    if out is None:
-                        output.append(child)
-                    else:
-                        output.append(out)
+                    output.append(inverse(eq3, str_form(eq2)))
                 else:
                     output.append(child)
         return TreeNode("f_try", output)
@@ -138,8 +134,7 @@ def solve_integrate(eq):
     eq2 = dowhile(eq, _solve_integrate)
     eq2 = dowhile(eq2, handle_try)
     eq2 = rm(eq2)
-    if eq2.name == "f_try":
-        eq2.children = list(set(eq2.children))
+    eq2.children = list(set(eq2.children))
     return eq2
 def integrate_subs(equation, term, v1, v2):
     output = []
@@ -381,7 +376,6 @@ def rm_const(equation):
                 return rm_const(TreeNode("f_integrate",[equation, wrt])) *const
         equation = eq2
     return TreeNode(equation.name, [rm_const(child)  for child in equation.children])
-
 def integrate_formula(equation):
     if equation.name == "f_ref":
         return equation.copy_tree()
@@ -390,18 +384,17 @@ def integrate_formula(equation):
         integrand = eq2.children[0]
         wrt = eq2.children[1]
         if integrand == wrt:
-            return wrt**2/2  # x^2/2
+            return TreeNode("f_add", [TreeNode("f_power", [wrt.copy_tree(), TreeNode("2")]), TreeNode("f_div", [TreeNode("1"), TreeNode("2")])])  # x^2/2
         if not contain(integrand, wrt):
-            return integrand*wrt
+            return TreeNode("f_mul", [wrt.copy_tree(), integrand.copy_tree()])  # constant * dx
         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:
-                
+                print(out, 111)
                 return out
     return TreeNode(eq2.name, [integrate_formula(child) for child in eq2.children])
 

{mathai-0.3.8 → mathai-0.4.0}/mathai.egg-info/PKG-INFO

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

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