mathai 2.4.4__tar.gz → 2.4.6__tar.gz

{mathai-2.4.4 → mathai-2.4.6}/PKG-INFO

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

{mathai-2.4.4 → mathai-2.4.6}/mathai/__init__.py

@@ -7,7 +7,7 @@ from .qm import hydrogen_gse, helium_gse, power_rule
 
 from .graphics import draw_graphics_from_solution, solve_graphics, solve_graphics_string
 
-from .benchmark import benchmark_ncert
+from .benchmark import benchmark
 
 from .formula_compiler import formula_compiler
 from .formula_compiler import formula_list_compiler

mathai-2.4.6/mathai/benchmark.py

@@ -0,0 +1,63 @@
+import random
+import copy
+from pathlib import Path
+from .simplify import simplify
+from .expand import expand
+from .parser import parse
+from .fraction import fraction
+from .apart import apart
+from .integrate import integrate_formula, integrate_trig_formula, integrate_fraction
+from .integrate import integrate_subs_main as integrate_subs
+from .integrate import solve_integrate as integrate_clean
+from .factor import factor2
+from .trig import trig0, trig1, trig4, trig6
+from .univariate_inequality import simple_wavycurvy, absolute
+from .limit import limit1
+from .logic import logic0
+from .base import *
+
+fx_list = [lambda x: dowhile(x, absolute), logic0, limit1, simple_wavycurvy, simplify, expand, fraction, integrate_formula, integrate_subs, integrate_trig_formula, integrate_clean, apart, trig0, trig1, trig4, integrate_fraction, factor2, trig6]
+name_list = "absolute, logic0, limit1, simple_wavycurvy, simplify, expand, fraction, integrate_formula, integrate_subs, integrate_trig_formula, integrate_clean, apart, trig0, trig1, trig4, integrate_fraction, factor2, trig6".split(", ")
+
+def benchmark(s="ncert_data"):
+    data_path = Path(__file__).parent / f"{s}.txt"
+    output_path = Path(__file__).parent / f"{s}_optimized.txt"
+    
+    optimized_lines = []
+    
+    with open(data_path, "r", encoding="utf-8") as file:
+        content = file.read().strip().split("\n")
+        count = 0
+        for item in content:
+            count += 1
+            item = item.strip()
+            if not item:
+                continue
+            parts = item.split(" ")
+            expr_str = parts[0]
+            eq = simplify(parse(expr_str))
+            
+            effective_steps = [expr_str]
+            
+            for func_name in parts[1:]:
+                func_idx = name_list.index(func_name)
+                func = fx_list[func_idx]
+                
+                # Deepcopy to avoid in-place mutation reference traps
+                prev_eq = copy.deepcopy(eq)
+                eq = func(eq)
+                
+                # Check if the function changed the equation
+                if eq == prev_eq:
+                    pass
+                else:
+                    effective_steps.append(func_name)
+            
+            print(f"{count}. {expr_str} => {eq}")
+            optimized_lines.append(" ".join(effective_steps))
+            
+    # Write out the optimized lines without non-changing functions
+    with open(output_path, "w", encoding="utf-8") as outfile:
+        outfile.write("\n".join(optimized_lines) + "\n")
+        
+    print(f"\nOptimized dataset successfully written to: {output_path}")

{mathai-2.4.4 → mathai-2.4.6}/mathai/ncert_data.txt

@@ -1,3 +1,14 @@
+abs(3*x-5)+abs(8-x)=abs(3+2*x) absolute simplify simple_wavycurvy
+(sin(x)+cosec(x))^2+(cos(x)+sec(x))^2=7+tan(x)^2+cot(x)^2 trig0 fraction trig1 fraction simplify trig1 logic0
+(1/(1-4*i)-2/(1+i))*((3-4*i)/(5+i))
+limit((1-cos(x))/x,x) limit1
+limit(sin(4*x)/sin(2*x),x) limit1
+4*x+3<6*x+7 simple_wavycurvy
+integrate(x/((x+1)*(x+2)),x) apart integrate_formula
+integrate((x^2+1)/(x^2-5*x+6),x) factor2 expand integrate_formula factor2 apart integrate_formula
+integrate(sin(2*x+5)^2,x) trig1 integrate_formula
+integrate((1-cos(x))/(1+cos(x)),x) trig6 expand integrate_formula integrate_trig_formula simplify integrate_trig_formula integrate_formula
+integrate(sin(x)/(1+cos(x)),x) trig6 expand integrate_formula simplify integrate_trig_formula
 integrate(cos(2*x),x) integrate_formula
 integrate(3*x^2+4*x^3,x) integrate_formula
 integrate(1/x,x) integrate_formula
@@ -5,7 +16,7 @@ integrate((x^3-1)/x^2,x) expand simplify integrate_formula
 integrate(x^(2/3)+1,x) integrate_formula
 integrate(x^(3/2)+2*e^x-1/x,x) integrate_formula
 integrate(sin(x)+cos(x),x) integrate_formula
-integrate(cosec(x)*(cosec(x)+cot(x)),x) trig0 fraction integrate_formula expand integrate_formula simplify integrate_trig_formula
+integrate(cosec(x)*(cosec(x)+cot(x)),x) trig0 fraction expand integrate_formula simplify integrate_trig_formula
 integrate((1-sin(x))/cos(x)^2,x) expand integrate_formula integrate_trig_formula
 integrate(sin(2*x),x) integrate_formula
 integrate(cos(3*x),x) integrate_formula
@@ -22,24 +33,24 @@ integrate((x^3+3*x+4)/sqrt(x),x) expand simplify integrate_formula
 integrate((x^3-x^2+x-1)/(x-1),x) expand integrate_formula apart integrate_formula integrate_subs expand simplify integrate_formula integrate_clean
 integrate((1-x)*sqrt(x),x) expand simplify integrate_formula
 integrate(sqrt(x)*(3*x^2+2*x+3),x) expand simplify integrate_formula
-integrate(2*x-3*cos(x)+e^x,x) simplify integrate_formula
+integrate(2*x-3*cos(x)+e^x,x) integrate_formula
 integrate(2*x^2-3*sin(x)+5*sqrt(x),x) integrate_formula
-integrate(sec(x)*(sec(x)+tan(x)),x) expand trig0 simplify integrate_formula integrate_trig_formula integrate_formula
-integrate(sec(x)^2/cosec(x)^2,x) trig0 simplify integrate_trig_formula integrate_formula trig1 integrate_formula
-integrate((2-3*sin(x))/cos(x)^2,x) expand simplify integrate_trig_formula integrate_formula integrate_trig_formula integrate_formula
-integrate(sqrt(x)+1/sqrt(x),x) expand simplify integrate_formula
+integrate(sec(x)*(sec(x)+tan(x)),x) expand trig0 simplify integrate_formula integrate_trig_formula
+integrate(sec(x)^2/cosec(x)^2,x) trig0 simplify integrate_trig_formula integrate_formula trig1
+integrate((2-3*sin(x))/cos(x)^2,x) expand simplify integrate_formula integrate_trig_formula
+integrate(sqrt(x)+1/sqrt(x),x) integrate_formula
 integrate(sin(x)^3*cos(x)^2,x) trig1 integrate_formula
-integrate(sin(x)/sin(x+a),x) integrate_subs trig4 expand simplify integrate_formula integrate_trig_formula integrate_formula integrate_clean
+integrate(sin(x)/sin(x+a),x) integrate_subs expand simplify integrate_formula integrate_trig_formula integrate_clean
 integrate((e^(2*x)-1)/(e^(2*x)+1),x) integrate_subs integrate_formula expand simplify apart integrate_formula integrate_clean
 integrate((e^(2*x)-e^(-2*x))/(e^(2*x)+e^(-2*x)),x) integrate_subs integrate_formula fraction simplify apart integrate_formula integrate_fraction integrate_clean
 integrate(tan(2*x-3)^2,x) trig0 integrate_trig_formula integrate_formula
-integrate(sec(7-4*x)^2,x) trig0 simplify integrate_trig_formula integrate_formula
+integrate(sec(7-4*x)^2,x) trig0 simplify integrate_trig_formula
 integrate((4*x+2)*sqrt(x^2+x+1),x) integrate_subs integrate_formula integrate_clean
 integrate(1/(x-sqrt(x)),x) integrate_subs integrate_formula factor2 apart integrate_formula integrate_clean
 integrate(e^arctan(x)/(1+x^2),x) integrate_subs integrate_formula integrate_clean
 integrate(x/e^(x^2),x) integrate_subs integrate_formula integrate_clean
 integrate(e^(2*x+3),x) integrate_formula
-integrate(x/(9-4*x^2),x) factor2 integrate_formula simplify apart simplify integrate_formula
+integrate(x/(9-4*x^2),x) factor2 simplify integrate_formula apart integrate_formula
 integrate(x^2/(2+3*x^3)^3,x) integrate_subs integrate_formula integrate_clean
 integrate(x*sqrt(1+2*x^2),x) integrate_subs integrate_formula integrate_clean
 integrate(x*sqrt(x+2),x) integrate_subs integrate_formula expand simplify integrate_formula integrate_clean
@@ -47,7 +58,7 @@ integrate(sqrt(a*x+b),x) integrate_formula
 integrate(sin(a*x+b)*cos(a*x+b),x) trig1 integrate_formula
 integrate(sin(cos(x))*sin(x),x) integrate_subs integrate_formula integrate_clean
 integrate(2*x/(1+x^2),x) integrate_formula integrate_fraction
-integrate(log(x)^2/x,x) integrate_subs simplify integrate_formula simplify integrate_formula integrate_clean
+integrate(log(x)^2/x,x) integrate_subs integrate_formula integrate_clean
 integrate(sin(arctan(x))/(1+x^2),x) integrate_subs integrate_formula integrate_clean
 integrate(2*x*sin(x^2+1),x) integrate_formula integrate_subs integrate_formula integrate_clean
-integrate(sin(m*x),x) integrate_formula
+integrate(sin(m*x),x) integrate_formula

{mathai-2.4.4 → mathai-2.4.6}/mathai/univariate_inequality.py

@@ -603,13 +603,6 @@ def domain(eq):
     return out
 
 def simple_wavycurvy(eq, mode=False):
-    if vlist(eq) == [] and (contain2(eq, "f_floor") or contain2(eq, "f_ceil")):
-        return dowhile(eq, lambda x: logic0(nothing(x)))
-    fx = lambda x: dowhile(x, lambda y: logic0(fraction(simplify(y))))
-    eq = fx(eq)
-    if "sqrt" in str(eq):
-        eq = handle_sqrt(eq)
-        eq = fx(eq)
     eq = factor2(eq)
     eq = simplify(eq, True, True)
     eq = wavycurvy(eq, mode)

{mathai-2.4.4 → mathai-2.4.6}/mathai.egg-info/PKG-INFO

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

{mathai-2.4.4 → mathai-2.4.6}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="mathai",
-    version="2.4.4",
+    version="2.4.6",
     description="Mathematics solving Ai tailored to NCERT",
     long_description=Path("README.md").read_text(encoding="utf-8"),
     long_description_content_type="text/markdown",

mathai-2.4.4/mathai/benchmark.py

@@ -1,25 +0,0 @@
-import random
-from .simplify import simplify
-from .expand import expand
-from .parser import parse
-from .fraction import fraction
-from .apart import apart
-from .integrate import integrate_formula, integrate_trig_formula, integrate_fraction
-from .integrate import integrate_subs_main as integrate_subs
-from .integrate import solve_integrate as integrate_clean
-from .factor import factor2
-from .trig import trig0, trig1, trig4
-fx_list = [simplify, expand, fraction, integrate_formula, integrate_subs, integrate_trig_formula, integrate_clean, apart, trig0, trig1, trig4, integrate_fraction, factor2]
-name_list = "simplify, expand, fraction, integrate_formula, integrate_subs, integrate_trig_formula, integrate_clean, apart, trig0, trig1, trig4, integrate_fraction, factor2".split(", ")
-def benchmark_ncert():
-    with importlib.resources.open_text("mathai.data", "ncert_integrals.txt", encoding="utf-8") as file:
-        content = file.read()
-        content = content.strip().split("\n")
-        count = 0
-        for item in content:
-            count += 1
-            item = item.strip()
-            eq = simplify(parse(item.split(" ")[0]))
-            for item2 in item.split(" ")[1:]:
-                eq = fx_list[name_list.index(item2)](eq)
-            print(f"{count}. {item.split(" ")[0]} => {eq}")