mathai 0.4.8__tar.gz → 0.5.0__tar.gz

{mathai-0.4.8 → mathai-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mathai
-Version: 0.4.8
+Version: 0.5.0
 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.8 → mathai-0.5.0}/mathai/__init__.py

@@ -1,7 +1,7 @@
 from .ode import diffsolve as ode_solve
 from .ode import diffsolve_sep as ode_shift_term
 
-from .linear import linear_solve
+from .linear import linear_solve, linear_or
 
 from .expand import expand
 
@@ -39,11 +39,10 @@ from .logic import logic0, logic1, logic2, logic3
 
 from .apart import apart, apart2
 
-from .console import console
-
 from .limit import limit
 
 from .univariate_inequality import wavycurvy, absolute, domain, handle_sqrt
+from .bivariate_inequality import inequality_solve
 
 from .base import *
 

mathai-0.5.0/mathai/bivariate_inequality.py

@@ -0,0 +1,296 @@
+import math
+from .linear import linear_or
+from functools import reduce
+import operator
+from .base import *
+from .simplify import simplify
+def shoelace_area(vertices):
+    n = len(vertices)
+    area = 0.0
+    for i in range(n):
+        j = (i + 1) % n
+        area += vertices[i][0] * vertices[j][1]
+        area -= vertices[j][0] * vertices[i][1]
+    return abs(area) / 2.0
+
+def triangle_area(p1, p2, p3):
+    area = 0.0
+    area += p1[0] * (p2[1] - p3[1])
+    area += p2[0] * (p3[1] - p1[1])
+    area += p3[0] * (p1[1] - p2[1])
+    return abs(area) / 2.0
+
+def is_point_inside_polygon(point, vertices):
+    if len(vertices) < 3:
+        return False
+
+    polygon_area = shoelace_area(vertices)
+    
+    total_triangle_area = 0.0
+    n = len(vertices)
+    for i in range(n):
+        j = (i + 1) % n
+        total_triangle_area += triangle_area(point, vertices[i], vertices[j])
+    
+    tolerance = 1e-5
+    return abs(total_triangle_area - polygon_area) < tolerance
+
+def distance_point_to_segment(px, py, x1, y1, x2, y2):
+    dx, dy = x2 - x1, y2 - y1
+    if dx == dy == 0:
+        return ((px - x1)**2 + (py - y1)**2)**0.5
+    t = max(0, min(1, ((px - x1) * dx + (py - y1) * dy) / (dx*dx + dy*dy)))
+    proj_x = x1 + t * dx
+    proj_y = y1 + t * dy
+    return ((px - proj_x)**2 + (py - proj_y)**2)**0.5
+
+def deterministic_middle_point(vertices, grid_resolution=100):
+    xs = [v[0] for v in vertices]
+    ys = [v[1] for v in vertices]
+    xmin, xmax = min(xs), max(xs)
+    ymin, ymax = min(ys), max(ys)
+    
+    best_point = None
+    max_dist = -1
+    
+    for i in range(grid_resolution + 1):
+        for j in range(grid_resolution + 1):
+            px = xmin + (xmax - xmin) * i / grid_resolution
+            py = ymin + (ymax - ymin) * j / grid_resolution
+            if not is_point_inside_polygon((px, py), vertices):
+                continue
+            min_edge_dist = float('inf')
+            n = len(vertices)
+            for k in range(n):
+                x1, y1 = vertices[k]
+                x2, y2 = vertices[(k + 1) % n]
+                d = distance_point_to_segment(px, py, x1, y1, x2, y2)
+                min_edge_dist = min(min_edge_dist, d)
+            if min_edge_dist > max_dist:
+                max_dist = min_edge_dist
+                best_point = (px, py)
+    
+    return best_point
+
+def build(eq):
+    if len(eq) <= 1:
+        return None
+    eq = TreeNode("f_or", eq)
+    eq = flatten_tree(eq)
+    orig = eq.copy_tree()
+    def fxhelper3(eq):
+        if eq.name[2:] in "le ge lt gt".split(" "):
+            return TreeNode("f_eq", [child.copy_tree() for child in eq.children])
+        return TreeNode(eq.name, [fxhelper3(child) for child in eq.children])
+    eq = fxhelper3(eq)
+
+    result = linear_or(eq)
+    maxnum = tree_form("d_2")
+    if len(result[1]) != 0:
+        maxnum = max([max([simplify(item2.fx("abs")) for item2 in item], key=lambda x: compute(x)) for item in result[1]], key=lambda x: compute(x))
+        maxnum += 1
+        maxnum = simplify(maxnum)
+    eq = flatten_tree(eq | simplify(TreeNode("f_or", [TreeNode("f_eq", [tree_form(item)+maxnum, tree_form("d_0")])|\
+                                                      TreeNode("f_eq", [tree_form(item)-maxnum, tree_form("d_0")]) for item in vlist(eq)])))
+    result2 = linear_or(eq)
+
+    point_lst = result2[2]
+
+    def gen(point):
+        nonlocal point_lst
+        out = []
+        for item in point_lst:
+            p = None
+            if point in item:
+                p = item.index(point)
+            else:
+                continue
+            if p < len(item)-1:
+                out.append(item[p+1])
+            if p > 0:
+                out.append(item[p-1])
+        return list(set(out))
+    start = list(range(len(result2[1])))
+    graph= {}
+    for item in start:
+        graph[item] = gen(item)
+
+    points = {}
+    for index, item in enumerate(result2[1]):
+        points[index] = [compute(item2) for item2 in item]
+
+    res = []
+    for index, item in enumerate(result2[1]):
+        if any(simplify(item2.fx("abs")-maxnum)!=0 and abs(compute(item2))>compute(maxnum) for item2 in item):
+            res.append(index)
+            
+    graph = {k: sorted(v) for k, v in graph.items()}
+
+    def dfs(current, parent, path, visited, cycles):
+        path.append(current)
+        visited.add(current)
+        for neighbor in graph[current]:
+            if neighbor == parent:
+                continue
+            if neighbor in visited:
+                idx = path.index(neighbor)
+                cycle = path[idx:]
+                cycles.append(cycle)
+            else:
+                dfs(neighbor, current, path, visited, cycles)
+        path.pop()
+        visited.remove(current)
+
+    cycles = []
+    for start in sorted(graph.keys()):
+        path = []
+        visited = set()
+        dfs(start, -1, path, visited, cycles)
+
+    def normalize(cycle):
+        k = len(cycle)
+        if k < 3:
+            return None
+        candidates = []
+        for direction in [cycle, list(reversed(cycle))]:
+            doubled = direction + direction[:-1]
+            for i in range(k):
+                rot = tuple(doubled[i:i + k])
+                candidates.append(rot)
+        return min(candidates)
+
+    unique = set()
+    for c in cycles:
+        norm = normalize(c)
+        if norm:
+            unique.add(norm)
+
+    cycles = sorted(list(unique), key=lambda x: (len(x), x))
+
+    start = list(range(len(result2[1])))
+    for i in range(len(cycles)-1,-1,-1):
+        if any(item in cycles[i] for item in res) or\
+           any(is_point_inside_polygon([compute(item2) for item2 in list(result2[1][p])], [[compute(item2) for item2 in result2[1][item]] for item in cycles[i]]) for p in list(set(start) - set(cycles[i]))) or\
+           any(len(set(graph[item]) & set(cycles[i]))>2 for item in cycles[i]):
+            cycles.pop(i)
+            
+    point_lst = [index for index, item in enumerate(result2[1]) if item in result[1]]
+    border = []
+    for item in start:
+        for item2 in graph[item]:
+            a = result2[1][item]
+            b = result2[1][item2]
+            
+            if a[0] == b[0] and simplify(a[0].fx("abs") - maxnum) == 0:
+                continue
+            if a[1] == b[1] and simplify(a[1].fx("abs") - maxnum) == 0:
+                continue
+            border.append(tuple(sorted([item, item2])))
+    line = []
+    for key in graph.keys():
+        for item in list(set(point_lst)&set(graph[key])):
+            line.append(tuple(sorted([item, key])))
+    line = list(set(line+border))
+    point_in = [deterministic_middle_point([[compute(item3) for item3 in result2[1][item2]] for item2 in item]) for item in cycles]
+    def work(eq, point):
+        if "f_eq" in str_form(eq):
+            return False
+        nonlocal result2
+        if eq.name[:2] == "d_":
+            return float(eq.name[2:])
+        if eq.name in result2[0]:
+            return point[result2[0].index(eq.name)]
+        if eq.name == "f_add":
+            return sum(work(item, point) for item in eq.children)
+        if eq.name == "f_mul":
+            return math.prod(work(item, point) for item in eq.children)
+        return {"gt":lambda a,b: a>b, "lt":lambda a,b: a<b}[eq.name[2:]](work(eq.children[0], point), work(eq.children[1], point))
+
+    data = []
+    for index, item in enumerate(result2[2][:-4]):
+        a = tuple(set(item) & set(point_lst))
+        b = tuple(set([tuple(sorted([item[i], item[i+1]])) for i in range(len(item)-1)]) & set(line))
+        c = tuple([tuple(item) for index2, item in enumerate(cycles) if work(orig.children[index], point_in[index2])])
+        data.append((a,b,c))
+        
+    total = tuple([tuple(point_lst), tuple(line), tuple(cycles)])
+    final = {}
+    for index, item in enumerate(orig.children):
+        final[item] = tuple(data[index])
+    return final, total, result2[1]
+
+def inequality_solve(eq):
+    element = []
+    def helper(eq):
+        nonlocal element
+        if eq.name[2:] in "le ge lt gt eq".split(" ") and "v_" in str_form(eq):
+            element.append(eq)
+        return TreeNode(eq.name, [helper(child) for child in eq.children])
+    helper(eq)
+    
+    out = build(list(set(element)))
+    
+    if out is None:
+        return eq
+    
+    def helper2(eq):
+        nonlocal out
+        if eq == tree_form("s_true"):
+            return [set(item) for item in out[1]]
+        if eq == tree_form("s_false"):
+            return [set(), set(), set()]
+        if eq in out[0].keys():
+            return [set(item) for item in out[0][eq]]
+        if eq.name == "f_or":
+            result = [helper2(child) for child in eq.children]
+            a = []
+            b = []
+            c = []
+            for item in result:
+                a += [item[0]]
+                b += [item[1]]
+                c += [item[2]]
+            x = a[0]
+            for item in a[1:]:
+                x |= item
+            y = b[0]
+            for item in b[1:]:
+                y |= item
+            z = c[0]
+            for item in c[1:]:
+                z |= item
+            return [x, y, z]
+        if eq.name == "f_and":
+            result = [helper2(child) for child in eq.children]
+            a = []
+            b = []
+            c = []
+            for item in result:
+                a += [item[0]]
+                b += [item[1]]
+                c += [item[2]]
+            x = a[0]
+            for item in a[1:]:
+                x &= item
+            y = b[0]
+            for item in b[1:]:
+                y &= item
+            z = c[0]
+            for item in c[1:]:
+                z &= item
+            return [x, y, z]
+        if eq.name == "f_not":
+            eq2 = helper2(eq.children[0])
+            a,b,c= eq2
+            d,e,f= [set(item) for item in out[1]]
+            return [d-a,e-b,f-c]
+    out2 = helper2(eq)
+    
+    out = list(out)
+    out[1] = [set(item) for item in out[1]]
+    
+    if tuple(out[1]) == tuple(out2):
+        return tree_form("s_true")
+    if tuple(out2) == (set(), set(), set()):
+        return tree_form("s_false")
+    return eq

mathai-0.5.0/mathai/linear.py

@@ -0,0 +1,157 @@
+from .inverse import inverse
+import itertools
+from .diff import diff
+from .simplify import simplify, solve
+from .fraction import fraction
+from .expand import expand
+from .base import *
+from .factor import factorconst
+def ss(eq):
+    return dowhile(eq, lambda x: fraction(expand(simplify(x))))
+def rref(matrix):
+    rows, cols = len(matrix), len(matrix[0])
+    lead = 0
+    for r in range(rows):
+        if lead >= cols:
+            return matrix
+        i = r
+        while ss(matrix[i][lead]) == tree_form("d_0"):
+            i += 1
+            if i == rows:
+                i = r
+                lead += 1
+                if lead == cols:
+                    return matrix
+        matrix[i], matrix[r] = matrix[r], matrix[i]
+        lv = matrix[r][lead]
+        matrix[r] = [ss(m / lv) for m in matrix[r]]
+        for i in range(rows):
+            if i != r:
+                lv = matrix[i][lead]
+                matrix[i] = [ss(m - lv * n) for m, n in zip(matrix[i], matrix[r])]
+        lead += 1
+    return matrix
+def islinear(eq, fxconst):
+    eq =simplify(eq)
+    if eq.name == "f_pow" and fxconst(eq):#"v_" in str_form(eq):
+        return False
+    for child in eq.children:
+        out = islinear(child, fxconst)
+        if not out:
+            return out
+    return True
+def linear(eqlist, fxconst):
+    eqlist = [eq for eq in eqlist if fxconst(eq)]
+    if not all(islinear(eq, fxconst) for eq in eqlist):
+        return TreeNode("f_and", copy.deepcopy(eqlist))
+    vl = []
+    def varlist(eq, fxconst):
+        nonlocal vl
+        if eq.name[:2] == "v_" and fxconst(eq):
+            vl.append(eq.name)
+        for child in eq.children:
+            varlist(child, fxconst)
+    for eq in eqlist:
+        varlist(eq, fxconst)
+    vl = list(set(vl))
+    
+    if len(vl) > len(eqlist):
+        return TreeNode("f_and", [TreeNode("f_eq", [x, tree_form("d_0")]) for x in eqlist])
+    m = []
+    for eq in eqlist:
+        s = copy.deepcopy(eq)
+        row = []
+        for v in vl:
+            row.append(diff(eq, v))
+            s = replace(s, tree_form(v), tree_form("d_0"))
+        row.append(s)
+        m.append(row)
+    for i in range(len(m)):
+        for j in range(len(m[i])):
+            m[i][j] = simplify(expand(m[i][j]))
+
+    m = rref(m)
+    
+    for i in range(len(m)):
+        for j in range(len(m[i])):
+            m[i][j] = fraction(m[i][j])
+    
+    output = []
+    for index, row in enumerate(m):
+        if not all(item == 0 for item in row[:-1]):
+            output.append(summation([tree_form(vl[index2])*coeff for index2, coeff in enumerate(row[:-1])])+row[-1])
+        elif row[-1] != 0:
+            return tree_form("s_false")
+    if len(output) == 1:
+        return TreeNode("f_eq", [output[0], tree_form("d_0")])
+    if len(output) == 0:
+        return tree_form("s_false")
+    return TreeNode("f_and", [TreeNode("f_eq", [x, tree_form("d_0")]) for x in output])
+def order_collinear_indices(points, idx):
+    """
+    Arrange a subset of collinear points (given by indices) along their line.
+    
+    points: list of (x, y) tuples
+    idx: list of indices referring to points
+    Returns: list of indices sorted along the line
+    """
+    if len(idx) <= 1:
+        return idx[:]
+    
+    # Take first two points from the subset to define the line
+    p0, p1 = points[idx[0]], points[idx[1]]
+    dx, dy = p1[0] - p0[0], p1[1] - p0[1]
+    
+    # Projection factor for sorting
+    def projection_factor(i):
+        vx, vy = points[i][0] - p0[0], points[i][1] - p0[1]
+        return compute((vx * dx + vy * dy) / (dx**2 + dy**2))
+    
+    # Sort indices by projection
+    sorted_idx = sorted(idx, key=projection_factor)
+    return list(sorted_idx)
+def linear_or(eq):
+    eq = simplify(eq)
+    eqlst =[]
+    if eq.name != "f_or":
+        eqlst = [eq]
+    else:
+        eqlst = eq.children
+    v = vlist(eq)
+    p = []
+    line = {}
+    for i in range(len(eqlst)):
+        line[i] = []
+    for item in itertools.combinations(enumerate(eqlst), 2):
+        x, y = item[0][0],  item[1][0]
+        item = [item[0][1], item[1][1]]
+        out = linear_solve(TreeNode("f_and", list(item)))
+        if out.name == "f_and" and all(len(vlist(child)) == 1 for child in out.children) and set(vlist(out)) == set(v):
+            t = {}
+            for child in out.children:
+                t[v.index(vlist(child)[0])] = simplify(inverse(child.children[0], vlist(child)[0]))
+            t2 = []
+            for key in sorted(t.keys()):
+                t2.append(t[key])
+            t2 = tuple(t2)
+            if t2 not in p:
+                p.append(t2)
+            line[x] += [p.index(t2)]
+            line[y] += [p.index(t2)]
+    line2 = []
+    for key in sorted(line.keys()):
+        line2.append(order_collinear_indices(p, list(set(line[key]))))
+    return v, p, line2, eqlst
+def linear_solve(eq, lst=None):
+    eq = simplify(eq)
+    eqlist = []
+    if eq.name =="f_and" and all(child.name == "f_eq" and child.children[1] == 0 for child in eq.children):
+        eqlist = [child.children[0] for child in eq.children]
+    else:
+        return eq
+    out = None
+    if lst is None:
+        out = linear(copy.deepcopy(eqlist), lambda x: "v_" in str_form(x))
+    else:
+        out = linear(copy.deepcopy(eqlist), lambda x: any(contain(x, item) for item in lst))
+    return simplify(out)

{mathai-0.4.8 → mathai-0.5.0}/mathai.egg-info/PKG-INFO

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

@@ -3,6 +3,7 @@ setup.py
 mathai/__init__.py
 mathai/apart.py
 mathai/base.py
+mathai/bivariate_inequality.py
 mathai/console.py
 mathai/diff.py
 mathai/expand.py

{mathai-0.4.8 → mathai-0.5.0}/setup.py

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

mathai-0.4.8/mathai/linear.py

@@ -1,156 +0,0 @@
-from .diff import diff
-from .simplify import simplify, solve
-from .fraction import fraction
-from .expand import expand
-from .base import *
-from .factor import factorconst
-def ss(eq):
-    return dowhile(eq, lambda x: fraction(expand(simplify(x))))
-def rref(matrix):
-    rows, cols = len(matrix), len(matrix[0])
-    lead = 0
-    for r in range(rows):
-        if lead >= cols:
-            return matrix
-        i = r
-        while ss(matrix[i][lead]) == tree_form("d_0"):
-            i += 1
-            if i == rows:
-                i = r
-                lead += 1
-                if lead == cols:
-                    return matrix
-        matrix[i], matrix[r] = matrix[r], matrix[i]
-        lv = matrix[r][lead]
-        matrix[r] = [ss(m / lv) for m in matrix[r]]
-        for i in range(rows):
-            if i != r:
-                lv = matrix[i][lead]
-                matrix[i] = [ss(m - lv * n) for m, n in zip(matrix[i], matrix[r])]
-        lead += 1
-    return matrix
-def islinear(eq, fxconst):
-    eq =simplify(eq)
-    if eq.name == "f_pow" and fxconst(eq):#"v_" in str_form(eq):
-        return False
-    for child in eq.children:
-        out = islinear(child, fxconst)
-        if not out:
-            return out
-    return True
-def linear(eqlist, fxconst):
-    final = []
-    extra = []
-    for i in range(len(eqlist)-1,-1,-1):
-        if eqlist[i].name == "f_mul" and not islinear(expand2(eqlist[i]), fxconst):
-            if "v_" in str_form(eqlist[i]):
-                eqlist[i] = TreeNode("f_mul", [child for child in eqlist[i].children if fxconst(child)])
-            if all(islinear(child, fxconst) for child in eqlist[i].children):
-                for child in eqlist[i].children:
-                    extra.append(TreeNode("f_eq", [child, tree_form("d_0")]))
-                eqlist.pop(i)
-            else:
-                final.append(TreeNode("f_eq", [eqlist[i], tree_form("d_0")]))
-                eqlist.pop(i)
-    
-    if extra != []:
-        final.append(TreeNode("f_or", extra))
-    if eqlist == []:
-        if len(final)==1:
-            
-            return final[0]
-        return TreeNode("f_and", final)
-    eqlist = [eq for eq in eqlist if fxconst(eq)]
-    if not all(islinear(eq, fxconst) for eq in eqlist):
-        return TreeNode("f_and", copy.deepcopy(final+eqlist))
-    vl = []
-    def varlist(eq, fxconst):
-        nonlocal vl
-        if eq.name[:2] == "v_" and fxconst(eq):
-            vl.append(eq.name)
-        for child in eq.children:
-            varlist(child, fxconst)
-    for eq in eqlist:
-        varlist(eq, fxconst)
-    vl = list(set(vl))
-    
-    if len(vl) > len(eqlist):
-        return TreeNode("f_and", final+[TreeNode("f_eq", [x, tree_form("d_0")]) for x in eqlist])
-    m = []
-    for eq in eqlist:
-        s = copy.deepcopy(eq)
-        row = []
-        for v in vl:
-            row.append(diff(eq, v))
-            s = replace(s, tree_form(v), tree_form("d_0"))
-        row.append(s)
-        m.append(row)
-    for i in range(len(m)):
-        for j in range(len(m[i])):
-            m[i][j] = simplify(expand(m[i][j]))
-
-    m = rref(m)
-    
-    for i in range(len(m)):
-        for j in range(len(m[i])):
-            m[i][j] = fraction(m[i][j])
-
-    for item in m:
-        if all(item2==tree_form("d_0") for item2 in item[:-1]) and item[-1] != tree_form("d_0"):
-            return tree_form("s_false")
-    
-    output = []
-    for index, row in enumerate(m):
-        count = 0
-        for item in row[:-1]:
-            if item == tree_form("d_1"):
-                count += 1
-                if count == 2:
-                    break
-            elif item == tree_form("d_0") and count == 1:
-                break
-        if count == 0:
-            continue
-        output.append(tree_form(vl[index])+row[-1])
-    if len(output) == 1 and len(final)==0:
-        return TreeNode("f_eq", [output[0], tree_form("d_0")])
-    return TreeNode("f_and", final+[TreeNode("f_eq", [x, tree_form("d_0")]) for x in output])
-
-def rmeq(eq):
-    if eq.name == "f_eq":
-        return rmeq(eq.children[0])
-    return TreeNode(eq.name, [rmeq(child) for child in eq.children])
-
-def mat0(eq, lst=None):
-    def findeq(eq):
-        out = []
-        if "f_list" not in str_form(eq) and "f_eq" not in str_form(eq):
-            return [str_form(eq)]
-        else:
-            for child in eq.children:
-                out += findeq(child)
-        return out
-    eqlist = findeq(eq)
-    eqlist = [tree_form(x) for x in eqlist]
-    eqlist = [rmeq(x) for x in eqlist]
-    eqlist = [TreeNode("f_mul", factor_generation(x)) for x in eqlist if x != tree_form("d_0")]
-    eqlist = [x.children[0] if len(x.children) == 1 else x for x in eqlist]
-    out = None
-    
-    if lst is None:
-        out = linear(copy.deepcopy(eqlist), lambda x: "v_" in str_form(x))
-    else:
-        out = linear(copy.deepcopy(eqlist), lambda x: any(contain(x, item) for item in lst))
-    def rms(eq):
-        if eq.name in ["f_and", "f_or"] and len(eq.children) == 1:
-            return eq.children[0]
-        return TreeNode(eq.name, [rms(child) for child in eq.children])
-    return rms(out)
-def linear_solve(eq, lst=None):
-    if eq.name == "f_and":
-        eq2 = copy.deepcopy(eq)
-        eq2.name = "f_list"
-        return mat0(eq2, lst)
-    elif eq.name == "f_eq":
-        return mat0(eq, lst)
-    return TreeNode(eq.name, [linear_solve(child, lst) for child in eq.children])