mathai 2.3.9__tar.gz → 2.4.0__tar.gz

{mathai-2.3.9 → mathai-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mathai
-Version: 2.3.9
+Version: 2.4.0
 Summary: Mathematics solving Ai tailored to NCERT
 Home-page: https://github.com/infinity390/mathai
 Requires-Python: >=3.7

{mathai-2.3.9 → mathai-2.4.0}/mathai/__init__.py

@@ -9,6 +9,9 @@ from .graphics import draw_graphics_from_solution, solve_graphics, solve_graphic
 
 from .benchmark import benchmark_ncert
 
+from .formula_compiler import formula_compiler
+from .formula_compiler import formula_list_compiler
+
 from .lambda_calculus import lambda_expand, lambda_compress, lambda_reduce
 
 from .electronic import Edge, CircuitGraph, find_resistance

mathai-2.4.0/mathai/diff.py

@@ -0,0 +1,24 @@
+from .simplify import simplify
+from .base import *
+from .parser import parse
+from .formula_compiler import formula_list_compiler
+
+diff2_s = """pdif(e^a,x) e^a*pdif(a,x) [] x _ _ _
+pdif(a^b,x) b*(a^(b-1))*pdif(a,x)+(a^b)*log(a)*pdif(b,x) [] x _ _ _
+pdif(sin(a),x) cos(a)*pdif(a,x) [] x _ _ _
+pdif(cos(a),x) -sin(a)*pdif(a,x) [] x _ _ _
+pdif(arcsin(a),x) (1/sqrt(1-a^2))*pdif(a,x) [] x _ _ _
+pdif(arccos(a),x) (-1/sqrt(1-a^2))*pdif(a,x) [] x _ _ _
+pdif(arctan(a),x) (1/(1+a^2))*pdif(a,x) [] x _ _ _
+pdif(k,x) 0 [] x k _ _
+pdif(x,x) 1 [] x _ _ _
+pdif(product(a,b),x) pdif(a,x)*b+a*pdif(b,x) [] x _ _ _
+pdif(sum(a,b),x) pdif(a,x)+pdif(b,x) [] x _ _ _
+pdif(product(k,a),x) k*pdif(a,x) [] x k _ _"""
+
+diff2 = formula_list_compiler(diff2_s)
+
+def diff(equation, var=None):
+    var = var if var else "v_0"
+    out = diff2(simplify(TreeNode("f_pdif", [equation, tree_form(var)])))
+    return out

{mathai-2.3.9 → mathai-2.4.0}/mathai/factor.py

@@ -7,9 +7,9 @@ import math
 from .tool import poly
 from .fraction import fraction
 from collections import Counter
-from .formula_applier import formula_list_applier
+from .formula_compiler import formula_list_compiler
 
-factor2 = lambda x: formula_list_applier(x, "poly(x,a,b,c) a*(x-(-b+sqrt(b^2-4*a*c))/(2*a))*(x-(-b-sqrt(b^2-4*a*c))/(2*a)) [] _ _ b^2-4*a*c _")
+factor2 = formula_list_compiler("poly(x,a,b,c) a*(x-(-b+sqrt(b^2-4*a*c))/(2*a))*(x-(-b-sqrt(b^2-4*a*c))/(2*a)) [] _ _ b^2-4*a*c _")
 def multiset_intersection(*lists):
     counters = list(map(Counter, lists))
     common = counters[0]

{mathai-2.3.9 → mathai-2.4.0}/mathai/formula_applier.py

@@ -705,6 +705,9 @@ def formula_list_applier(eq, s):
     return dowhile(eq, lambda x: formula_list_applier_h(x, s))
 
 
+def _is_zero(node):
+    return node is not None and (getattr(node, "name", None) == "d_0" or node == 0)
+
 def extract_polynomial_coefficients(eq, var, degree):
     if eq is None:
         return None
@@ -717,12 +720,14 @@ def extract_polynomial_coefficients(eq, var, degree):
         if c_val is None:
             return None
         coefficients.append(c_val)
-        simplified_num = simplify(operation("f_sub", [current_eq, c_val]))
-        if simplified_num == 0:
+        remainder = simplify(operation("f_sub", [current_eq, c_val]))
+        if remainder is None:
+            return None
+        if _is_zero(remainder):
             coefficients.extend(TreeNode("d_0") for _ in range(degree + 1 - len(coefficients)))
             return coefficients
-        current_eq = simplify(expand(simplify(operation("f_div", [simplified_num, var_node]))))
+        current_eq = simplify(expand(simplify(operation("f_div", [remainder, var_node]))))
         if current_eq is None:
             return None
     final_check = simplify(replace(copy.deepcopy(current_eq), var_node, zero_node))
-    return coefficients if final_check == 0 else None
+    return coefficients if _is_zero(final_check) else None