mathai 0.8.1__tar.gz → 0.8.2__tar.gz

{mathai-0.8.1 → mathai-0.8.2}/PKG-INFO

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

{mathai-0.8.1 → mathai-0.8.2}/mathai/__init__.py

@@ -35,7 +35,8 @@ from .inverse import inverse
 
 from .trig import trig0, trig1, trig2, trig3, trig4
 
-from .logic import logic0, logic1, logic2, logic3, logic_n
+from .logic import logic0, logic1, logic2, logic3, logic_n, set_sub
+from .logic import auto_apply as logic_x
 
 from .apart import apart, apart2
 

{mathai-0.8.1 → mathai-0.8.2}/mathai/base.py

@@ -1,3 +1,4 @@
+import time
 import copy
 from fractions import Fraction
 def use(eq):
@@ -352,6 +353,8 @@ def flatten_tree(node):
         merged_children = []
         for child in node.children:
             flattened_child = flatten_tree(child)
+            if flattened_child is None:
+                return None
             if flattened_child.name == node.name:
                 merged_children.extend(flattened_child.children)
             else:
@@ -360,7 +363,7 @@ def flatten_tree(node):
     else:
         node.children = [flatten_tree(child) for child in node.children]
         return node
-def dowhile(eq, fx):
+def dowhile(eq, fx, start_time=None, budget=None):
     if eq is None:
         return None
     while True:
@@ -368,6 +371,10 @@ def dowhile(eq, fx):
         eq2 = fx(eq)
         if eq2 is None:
             return None
+        if start_time is not None:
+            if -start_time + time.monotonic() > budget:
+              print("timeout")
+              return None
         eq = copy.deepcopy(eq2)
         if eq == orig:
             return orig

{mathai-0.8.1 → mathai-0.8.2}/mathai/logic.py

@@ -1,3 +1,4 @@
+import time
 import itertools
 from .base import *
 def c(eq):
@@ -5,6 +6,35 @@ def c(eq):
      eq = dowhile(eq, logic0)
      eq = dowhile(eq, logic2)
      return eq
+def set_sub(eq):
+  if eq.name == "f_sub":
+    return eq.children[0] & eq.children[1].fx("not")
+  return TreeNode(eq.name, [set_sub(child) for child in eq.children])
+
+start_time = None
+budget = 2.0
+def auto_apply(eq):
+    global start_time
+    fs = [logic1, logic2]
+    results = []
+    pair = 0
+    for g in fs:
+        for f in fs:
+            start_time = time.monotonic()
+            r = dowhile(g(f(eq)), logic0)
+            if r is None:
+                 continue
+            if r != eq:
+                results.append(r)
+            start_time = None
+            pair += 1
+            #print(f"pair {pair}")
+    if not results:
+        return eq
+
+    return min(results, key=lambda x: len(str(x)))
+
+
 def logic_n(eq):
      return dowhile(eq, c)
 def logic0(eq):
@@ -40,6 +70,13 @@ def logic3(eq):
         return TreeNode("f_forall", [eq.children[0], eq.children[1].fx("not")]).fx("not")
     return TreeNode(eq.name, [logic3(child) for child in eq.children])
 def logic2(eq):
+    if eq is None:
+         return None
+    global start_time, budget
+    if start_time is not None:
+         if -start_time + time.monotonic() > budget:
+              #print("timeout")
+              return None
     if eq.name in ["f_exist", "f_forall"]:
         return TreeNode(eq.name, [eq.children[0], logic2(eq.children[1])])
     if eq.name not in ["f_and", "f_or", "f_not", "f_imply", "f_equiv"]:
@@ -111,6 +148,10 @@ def logic2(eq):
 
     if eq.name in ["f_and", "f_or"] and any(child.children is not None and len(child.children)!=0 for child in eq.children):
         for i in range(len(eq.children),1,-1):
+            if start_time is not None:
+                if time.monotonic() - start_time > budget:
+                     
+                    return None
             for item in itertools.combinations(enumerate(eq.children), i):
                 op = "f_and"
                 if eq.name == "f_and":
@@ -148,7 +189,20 @@ def logic2(eq):
                 return output
     return TreeNode(eq.name, [flatten_tree(logic2(child)) for child in eq.children])
 def logic1(eq):
+    if eq is None:
+         return None
+    global start_time, budget
+    if start_time is not None:
+         if time.monotonic() - start_time > budget:
+              #print("timeout")
+              return None
+         else:
+              pass
     def helper(eq):
+        if start_time is not None:
+            if -start_time + time.monotonic() > budget:
+               #print("timeout")
+               return None
         if eq.name in ["f_exist", "f_forall"]:
             return TreeNode(eq.name, [eq.children[0], logic1(eq.children[1])])
         if eq.name not in ["f_and", "f_or", "f_not", "f_imply", "f_equiv"]:
@@ -156,13 +210,17 @@ def logic1(eq):
         if eq.name == "f_equiv":
             A, B = eq.children
             A, B = logic1(A), logic1(B)
-            A, B = dowhile(A, logic2), dowhile(B, logic2)
+            A, B = dowhile(A, logic2, start_time, budget), dowhile(B, logic2, start_time, budget)
+            if A is None or B is None:
+                 return None
             return flatten_tree((A & B) | (A.fx("not") & B.fx("not")))
         if eq.name == "f_imply":
 
             A, B = eq.children
             A, B = logic1(A), logic1(B)
-            A, B = dowhile(A, logic2), dowhile(B, logic2)
+            A, B = dowhile(A, logic2, start_time, budget), dowhile(B, logic2, start_time, budget)
+            if A is None or B is None:
+                 return None
             return flatten_tree(A.fx("not") | B)
         return TreeNode(eq.name, [helper(child) for child in eq.children])
     if eq.name in ["f_exist", "f_forall"]:
@@ -171,30 +229,27 @@ def logic1(eq):
         return eq
     eq = helper(eq)
     eq = flatten_tree(eq)
-
     if len(eq.children) > 2:
         lst = []
         l = len(eq.children)
-
         if l % 2 == 1:
             last_child = eq.children[-1]
 
             if isinstance(last_child, TreeNode):
-                last_child = dowhile(last_child, logic2)
+                last_child = dowhile(last_child, logic2, start_time, budget)
             lst.append(last_child)
             l -= 1
 
         for i in range(0, l, 2):
             left, right = eq.children[i], eq.children[i+1]
             pair = TreeNode(eq.name, [left, right])
-            simplified = dowhile(logic1(pair), logic2)
+            simplified = dowhile(logic1(pair), logic2, start_time, budget)
             lst.append(simplified)
 
         if len(lst) == 1:
             return flatten_tree(lst[0])
 
         return flatten_tree(TreeNode(eq.name, lst))
-
     if eq.name == "f_and":
         lst= []
         for child in eq.children:
@@ -224,4 +279,3 @@ def logic1(eq):
             out = out.children[0]
         return flatten_tree(out)
     return TreeNode(eq.name, [logic1(child) for child in eq.children])
-

{mathai-0.8.1 → mathai-0.8.2}/mathai.egg-info/PKG-INFO

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

{mathai-0.8.1 → mathai-0.8.2}/setup.py

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