mathai 0.3.9__tar.gz → 0.4.1__tar.gz

{mathai-0.3.9 → mathai-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mathai
-Version: 0.3.9
+Version: 0.4.1
 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.9 → mathai-0.4.1}/mathai/base.py

@@ -290,6 +290,8 @@ def flatten_tree(node):
         node.children = [flatten_tree(child) for child in node.children]
         return node
 def dowhile(eq, fx):
+    if eq is None:
+        return None
     while True:
         orig = eq.copy_tree()
         eq2 = fx(eq)

{mathai-0.3.9 → mathai-0.4.1}/mathai/integrate.py

@@ -132,7 +132,7 @@ def inteq(eq):
 def rm(eq):
     if eq.name == "f_try":
         eq = TreeNode(eq.name, list(set(eq.children)))
-    return TreeNode(eq.name, [rm(child) for child in eq.children])
+    return TreeNode(eq.name, [rm(child) for child in eq.children if child is not None])
 def solve_integrate(eq):
     
     eq2 = dowhile(eq, _solve_integrate)
@@ -296,7 +296,7 @@ def _sqint(equation):
     return coll
 
 def sqint(eq):
-    out = _sqint(eq)
+    out = simplify(_sqint(eq))
     if out is None:
         return eq
     return out

mathai-0.4.1/mathai/search.py

@@ -0,0 +1,117 @@
+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

{mathai-0.3.9 → mathai-0.4.1}/mathai/simplify.py

@@ -287,7 +287,7 @@ def simplify(eq):
             else:
                 eq = tree_form("d_0")
         
-        if eq.name == "f_mul" and str_form(eq).count("f_pow")>1:
+        if eq.name == "f_mul":
             dic = {}
             for child in eq.children:
                 head = child

{mathai-0.3.9 → mathai-0.4.1}/mathai.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mathai
-Version: 0.3.9
+Version: 0.4.1
 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.9 → mathai-0.4.1}/mathai.egg-info/SOURCES.txt

@@ -15,6 +15,7 @@ mathai/linear.py
 mathai/logic.py
 mathai/parser.py
 mathai/printeq.py
+mathai/search.py
 mathai/simplify.py
 mathai/structure.py
 mathai/tool.py

{mathai-0.3.9 → mathai-0.4.1}/setup.py

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