mathai 0.4.1__py3-none-any.whl → 0.4.2__py3-none-any.whl

mathai/integrate.py

@@ -343,6 +343,7 @@ def integration_formula_init():
                     (f"e^(A*{var}+B)", f"e^(A*{var}+B)/A"),\
                     (f"1/cos({var})", f"log(abs((1+sin({var}))/cos({var})))"),\
                     (f"1/cos({var})^2", f"sin({var})/cos({var})"),\
+                    (f"1/sin({var})", f"log(abs(tan({var}/2)))"),\
                     (f"abs(A*{var}+B)", f"(A*{var}+B)*abs(A*{var}+B)/(2*A)")]
     formula_list = [[simplify(parse(y)) for y in x] for x in formula_list]
     expr = [[parse("A"), parse("1")], [parse("B"), parse("0")]]

mathai/simplify.py

@@ -279,6 +279,7 @@ def simplify(eq):
                         return (eq.children[1-i].children[0]**eq.children[i]).fx("log")
             if eq.name == "f_pow" and eq.children[0] == tree_form("s_e") and eq.children[1].name == "f_log":
                 return eq.children[1].children[0]
+            
         if eq.name == "f_pow" and eq.children[0] == tree_form("d_1"):
             eq = tree_form("d_1")
         if eq.name == "f_pow" and eq.children[0] == tree_form("d_0"):
@@ -301,7 +302,7 @@ def simplify(eq):
                     dic[head] = tail
                 else:
                     dic[head] += tail
-            if len(eq.children) != len(dic.keys()):
+            if len(eq.children) > len(dic.keys()):
                 eq = product([key if dic[key] == 1 else key**dic[key] for key in dic.keys()])
         if eq.name == "f_pow" and eq.children[0].name == "f_pow" and eq.children[0].children[1] == tree_form("d_2")**-1 and eq.children[1] == tree_form("d_2"):
             eq = eq.children[0].children[0]
@@ -315,7 +316,11 @@ def simplify(eq):
             eq = eq.children[0].children[0]
         if eq.name == "f_abs" and eq.children[0].name[:2] == "d_":
             eq = tree_form("d_"+str(abs(int(eq.children[0].name[2:]))))
-            
+        if eq.name == "f_abs" and "v_" not in str_form(eq.children[0]):
+            if compute(eq.children[0]) > 0.00001:
+                eq = eq.children[0]
+            elif compute(eq.children[0]) < 0.00001:
+                eq = -eq.children[0]
         if eq.name == "f_pow" and  eq.children[0].name[:2] == "d_" and frac(eq.children[1]) is not None:
             f = frac(eq.children[1])
             if f.denominator != 1:

mathai/trig.py

@@ -169,7 +169,12 @@ def trig4(eq, numer=True):
     if eq.name == "f_sin":
         if eq.children[0].name == "f_add" and len(eq.children[0].children)>=2:
             r = len(eq.children[0].children)%2
-            a, b = eq.children[0].children[:(len(eq.children[0].children)-r)/2], eq.children[0].children[(len(eq.children[0].children)-r)/2:]
+            a, b = TreeNode("f_add", eq.children[0].children[:round((len(eq.children[0].children)-r)/2)]),\
+                   TreeNode("f_add", eq.children[0].children[round((len(eq.children[0].children)-r)/2):])
+            if len(a.children)==1:
+                a=a.children[0]
+            if len(b.children)==1:
+                b=b.children[0]
             return a.fx("sin")*b.fx("cos") + a.fx("cos")*b.fx("sin")
         if eq.children[0].name == "f_arccos":
             a = eq.children[0].children[0]
@@ -189,7 +194,12 @@ def trig4(eq, numer=True):
     if eq.name == "f_cos":
         if eq.children[0].name == "f_add" and len(eq.children[0].children)>=2:
             r = len(eq.children[0].children)%2
-            a, b = eq.children[0].children[:(len(eq.children[0].children)-r)/2], eq.children[0].children[(len(eq.children[0].children)-r)/2:]
+            a, b = TreeNode("f_add", eq.children[0].children[:round((len(eq.children[0].children)-r)/2)]),\
+                   TreeNode("f_add", eq.children[0].children[round((len(eq.children[0].children)-r)/2):])
+            if len(a.children)==1:
+                a=a.children[0]
+            if len(b.children)==1:
+                b=b.children[0]
             return a.fx("cos")*b.fx("cos") - a.fx("sin")*b.fx("sin")
         if eq.children[0].name == "f_arcsin":
             a = eq.children[0].children[0]

{mathai-0.4.1.dist-info → mathai-0.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mathai
-Version: 0.4.1
+Version: 0.4.2
 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.4.1.dist-info → mathai-0.4.2.dist-info}/RECORD

@@ -6,20 +6,19 @@ 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=mKw_L8zccFifJINKLCFiYBrkgQM2qO_Pk8b2ShgxTa8,15065
+mathai/integrate.py,sha256=a0zAndTUco7FhEDSkuQFtTNzh-5Q0E2_bYkYqWpbgu0,15133
 mathai/inverse.py,sha256=QCvDrzKquWsZv-BDAzZd9HnU0c3gZvcc44UztHVO5LQ,2919
 mathai/limit.py,sha256=RA8YAehgYCGVWv9qBc8uQ34BQ9mFthWl2OrVTwcHl2g,4920
 mathai/linear.py,sha256=BzSnm941Zlod_l6hON4Rs6J4pdAA3MGpRVqr6-66ZBk,5524
 mathai/logic.py,sha256=UvHzRmKcO9AD51tRzHmpNSEhgW5gmaf4XPaQKFjGfC4,9653
 mathai/parser.py,sha256=f7bemieFmp0sbup1NlraMLvZDVFvqKGFknEVtlFRMVk,6979
 mathai/printeq.py,sha256=gIes-pstFOa6FcnpVIVvkjVKuWdsVdo11LlEnmHhakU,1303
-mathai/search.py,sha256=6S_V0PrC2ZnbhkWyT2ZTtExRD_mDlo-C3p0TDn6Dk3w,4743
-mathai/simplify.py,sha256=qG23MRyVLjJL_8Xk5n4Z596bjihFvZg_zKtIvOqrLIk,15824
+mathai/simplify.py,sha256=nxDjrQzC0wgF4BooBiHI_7mTdEJgygOSM97zx1zBR5c,16075
 mathai/structure.py,sha256=4Ww2IAx62RcQSO7_17TZES-DjMWBpcFQtL939FBIHwY,4103
 mathai/tool.py,sha256=UyccamiJy_CkFPakfufyPzdhtlEO6v2D7qwbXQ9V7Rg,2000
-mathai/trig.py,sha256=Zadw-uTJaMfoXwxuiio7QYHWgPxezEP2xZ2fr__PFM0,10290
+mathai/trig.py,sha256=VYpn3_uuFrr9xOXBSOSGlwdlGHAAlGEzjA1ez-HsZxQ,10712
 mathai/univariate_inequality.py,sha256=_r-kkiS4Hr-jRN7f-EL_E4svAMFWJP1Ea50HJKKbjfk,14778
-mathai-0.4.1.dist-info/METADATA,sha256=m5N3sDp8R2_3ffySHyzvmo4YDpxYq6dT3FXUfkerCco,7021
-mathai-0.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mathai-0.4.1.dist-info/top_level.txt,sha256=ROP4l3OhGYw3ihkQGASr18xM9GsK4z3_6whV5AyXLwE,7
-mathai-0.4.1.dist-info/RECORD,,
+mathai-0.4.2.dist-info/METADATA,sha256=fXzD9pbztl7ku4RJ2BRJosBOXoe1R6uj-SDiTnyRbgM,7021
+mathai-0.4.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mathai-0.4.2.dist-info/top_level.txt,sha256=ROP4l3OhGYw3ihkQGASr18xM9GsK4z3_6whV5AyXLwE,7
+mathai-0.4.2.dist-info/RECORD,,

mathai/search.py

@@ -1,117 +0,0 @@
-from mathai import *
-import copy
-from concurrent.futures import ThreadPoolExecutor, TimeoutError
-
-def dfs_simplify(equation, functions, true_expr, false_expr,
-                 max_timeout=25, max_small=4,
-                 base_timeout=1, time_per_char=0.1, timeout_increase=0.5):
-    """
-    Perform DFS simplification on a given equation using provided functions.
-
-    Args:
-        equation: The starting expression (TreeNode or parsed equation)
-        functions: List of simplification functions
-        true_expr: Expression representing True (immediate termination)
-        false_expr: Expression representing False (immediate termination)
-        max_timeout: Maximum timeout allowed for any function
-        max_small: Number of smallest expressions to track
-        base_timeout: Base timeout in seconds
-        time_per_char: Additional timeout per character of expression
-        timeout_increase: Factor to increase timeout for consecutive timeouts
-
-    Returns:
-        tuple(found_boolean, boolean_path, smallest_expressions)
-    """
-    original_eq = simplify(equation)
-    smallest_four = []
-
-    stack = [(copy.deepcopy(original_eq), [copy.deepcopy(original_eq)])]
-    visited = set()
-
-    found_boolean = False
-    boolean_path = None
-    boolean_expr = None
-
-    executor = ThreadPoolExecutor(max_workers=3)
-    consecutive_timeouts = 0
-
-    while stack and not found_boolean:
-        current_eq, path = stack.pop()
-        expr_str = str(current_eq)
-
-        if expr_str in visited:
-            continue
-        visited.add(expr_str)
-
-        # Thinking message
-        printeq(current_eq)
-
-        # Immediate termination using predicate functions
-        if true_expr(current_eq):
-            found_boolean = True
-            boolean_path = path
-            boolean_expr = current_eq
-            break
-        if false_expr(current_eq):
-            found_boolean = True
-            boolean_path = path
-            boolean_expr = current_eq
-            break
-
-
-        # Insert into smallest_four if qualifies
-        inserted = False
-        for j in range(len(smallest_four)):
-            if len(expr_str) < len(str(smallest_four[j][0])):
-                smallest_four.insert(j, (copy.deepcopy(current_eq), copy.deepcopy(path)))
-                inserted = True
-                break
-        if not inserted and len(smallest_four) < max_small:
-            smallest_four.append((copy.deepcopy(current_eq), copy.deepcopy(path)))
-        if len(smallest_four) > max_small:
-            smallest_four = smallest_four[:max_small]
-
-        # Calculate adaptive timeout with cap
-        timeout = (base_timeout + time_per_char * len(expr_str)) * (1 + timeout_increase * consecutive_timeouts)
-        if timeout > max_timeout:
-            timeout = max_timeout
-
-        # Try functions that reduce length first
-        reduced_any = False
-        for fx in functions:
-            print(f"[Thinking] Executing {fx.__name__} on current expression (timeout={timeout:.2f}s):")
-            printeq(current_eq)
-            future = executor.submit(fx, current_eq)
-            try:
-                new_expr = future.result(timeout=timeout)
-                new_expr_str = str(new_expr)
-                if len(new_expr_str) <= len(expr_str) and new_expr_str != expr_str:
-                    reduced_any = True
-                    stack.append((new_expr, path + [copy.deepcopy(new_expr)]))
-                consecutive_timeouts = 0  # reset after success
-            except TimeoutError:
-                print(f"[Thinking] {fx.__name__} timed out, skipping.")
-                consecutive_timeouts += 1
-                continue
-
-        # If no reducing function worked, try growing functions
-        if not reduced_any:
-            for fx in functions:
-                print(f"[Thinking] Trying growing {fx.__name__} on current expression (timeout={timeout:.2f}s):")
-                printeq(current_eq)
-                future = executor.submit(fx, current_eq)
-                try:
-                    new_expr = future.result(timeout=timeout)
-                    new_expr_str = str(new_expr)
-                    if new_expr_str != expr_str:
-                        stack.append((new_expr, path + [copy.deepcopy(new_expr)]))
-                        consecutive_timeouts = 0
-                        break  # only take one growing function
-                except TimeoutError:
-                    print(f"[Thinking] {fx.__name__} (growing) timed out, skipping.")
-                    consecutive_timeouts += 1
-                    continue
-
-    executor.shutdown(wait=True)
-
-    return found_boolean, boolean_path, smallest_four