mathai 0.2.0__tar.gz → 0.2.1__tar.gz

{mathai-0.2.0 → mathai-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mathai
-Version: 0.2.0
+Version: 0.2.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.2.0 → mathai-0.2.1}/mathai/__init__.py

@@ -11,4 +11,5 @@ from .trig import trig0, trig1, trig2, trig3, trig4
 from .logic import logic0, logic1, logic2, logic3
 from .apart import apart
 from .console import console
+from .limit import limit
 from .base import *

{mathai-0.2.0 → mathai-0.2.1}/mathai/base.py

@@ -145,6 +145,8 @@ def frac(eq):
         a = frac(eq.children[0])
         b = frac(eq.children[1])
         if isinstance(a, Fraction) and isinstance(b, Fraction) and b.denominator==1:
+            if a == 0 and b <= 0:
+                return None
             return a**b
         else:
             return None

{mathai-0.2.0 → mathai-0.2.1}/mathai/expand.py

@@ -4,6 +4,8 @@ from .base import *
 from .simplify import solve, simplify
 
 def expand(eq):
+    if eq is None:
+        return None
     if eq.name == "f_mul" or eq.name == "f_pow":
         if eq.name == "f_pow":
             eq = TreeNode("f_pow", [eq]) 

mathai-0.2.1/mathai/limit.py

@@ -0,0 +1,126 @@
+from .structure import structure
+from .base import *
+from .parser import parse
+from .simplify import simplify, solve
+from .expand import expand
+from .diff import diff
+from .trig import trig0
+from .fraction import fraction
+from .printeq import printeq_str
+tab=0
+def substitute_val(eq, val, var="v_0"):
+    eq = replace(eq, tree_form(var), tree_form("d_"+str(val)))
+    return eq
+
+def subslimit(equation, var):
+    equation2 = trig0(replace(equation, var, tree_form("d_0")))
+    try:
+        tmp = simplify(equation2)
+        return simplify(expand(tmp))
+    except:
+        return None
+    
+def check(num, den, var):
+    n, d = None, None
+    
+    n, d = (dowhile(replace(e, var, tree_form("d_0")), lambda x: trig0(simplify(x))) for e in (num, den))
+    if n is None or d is None:
+        return False
+    if n == 0 and d == 0: return True
+    if d != 0: return simplify(n/d)
+    return False
+def lhospital(num, den, steps,var):
+    logs = []
+    out = check(num, den, var)
+    if isinstance(out, TreeNode):
+        return out
+    for _ in range(steps):
+        num2, den2 = map(lambda e: simplify(diff(e, var.name)), (num, den))
+        out = check(num2, den2, var)
+        if out is True:
+            num, den = num2, den2
+            logs += [(0,"lim x->0 "+printeq_str(simplify(num/den)))]
+            continue
+        if out is False:
+            eq2 = simplify(fraction(simplify(num/den)))
+            return eq2,logs
+        return out,logs
+def lhospital2(eq, var):
+    eq=  simplify(eq)
+    if eq is None:
+        return None
+    if not contain(eq, var):
+        return eq,[]
+    num, dem = [simplify(item) for item in num_dem(eq)]
+    if num is None or dem is None:
+        return eq,[]
+    
+    return lhospital(num, dem, 10,var)
+ls = [parse("sin(A)"), parse("A^B-1"),parse("log(1+A)"), parse("cos(A)")]
+ls= [simplify(item) for item in ls]
+
+def approx(eq, var):
+    n, d= num_dem(eq)
+    n, d = solve(n), solve(d)
+    n, d = expand(n), expand(d)
+    out = []
+    for equation in [n, d]:
+        for item in factor_generation(equation):
+            tmp = structure(item, ls[0])
+            if tmp is not None and contain(tmp["v_-1"], var):
+                item2 = substitute_val(tmp["v_-1"], 0, var.name)
+                if tree_form("d_0") == expand(simplify(item2)):
+                    equation = equation/item
+                    equation = equation*tmp["v_-1"]
+                    break
+                elif tree_form("d_0") == expand(simplify(tree_form("s_pi") - item2)):
+                    equation = equation/item
+                    equation = equation*(tree_form("s_pi") - tmp["v_-1"])
+                    break
+            tmp = structure(item, ls[1])
+            if tmp is not None and contain(tmp["v_-1"], var) and not contain(tmp["v_-2"], var):
+                item2 = substitute_val(tmp["v_-1"], 0, var.name)
+                item2 = expand(solve(item2))
+                if tree_form("d_0") == item2:
+                    equation = equation/item
+                    equation = solve(equation*tmp["v_-1"]*tmp["v_-2"].fx("log"))
+                    break
+            tmp = structure(item, ls[2])
+            if tmp is not None and contain(tmp["v_-1"], var):
+                                
+                item2 = substitute_val(tmp["v_-1"], 0, var.name)
+                item2 = expand(solve(item2))
+                if tree_form("d_0") == item2:
+                    equation = equation/item
+                    equation = solve(equation*tmp["v_-1"])
+                    break
+            tmp = structure(item, ls[3])
+            if tmp is not None and contain(tmp["v_-1"], var):
+                item2 = substitute_val(item, 0, var.name)
+                
+                if tree_form("d_0") == expand(solve(item2)):
+                    
+                    equation = equation/item
+                    equation = equation*(tree_form("d_1") - tmp["v_-1"]**tree_form("d_2"))
+                    break
+                
+        equation = solve(equation)
+        out.append(equation)
+    return simplify(out[0]/out[1])
+def approx_limit(equation, var):
+    return dowhile(equation, lambda x: approx(x, var))
+
+def limit(equation, var=tree_form("v_0")):
+    logs = [(0,"lim x->0 "+printeq_str(simplify(equation)))]
+    eq2 = dowhile(replace(equation, var, tree_form("d_0")), lambda x: trig0(simplify(x)))
+    if eq2 is not None and not contain(equation, var):
+        return eq2,logs
+    equation, tmp = lhospital2(equation, var)
+    equation = simplify(expand(simplify(equation)))
+    if not contain(equation, var):
+        return equation,logs+tmp
+    '''
+    if equation.name == "f_add":
+        return simplify(summation([limit(child, var) for child in equation.children]))
+    '''
+    return equation,logs+tmp

{mathai-0.2.0 → mathai-0.2.1}/mathai/simplify.py

@@ -157,6 +157,7 @@ def clear_div(eq):
     return solve(product(lst2))
 
 def simplify(eq):
+    error = False
     if eq.name == "f_eq":
         if eq.children[1] != 0:
             return TreeNode(eq.name, [clear_div(simplify(eq.children[0]-eq.children[1])), tree_form("d_0")])
@@ -170,6 +171,11 @@ def simplify(eq):
             
             a, b = int(eq.children[0].name[2:]), int(eq.children[1].name[2:])
             a = a**abs(b)
+            if b == 0 and a == 0:
+                error= True
+                return eq
+            if b == 0:
+                b = 1
             b = int(b/abs(b))
             if b == 1:
                 eq = tree_form("d_"+str(a))
@@ -195,6 +201,9 @@ def simplify(eq):
             for i in range(len(eq.children)-1,-1,-1):
                 child= eq.children[i]
                 if child.name == "f_pow" and child.children[0].name[:2] == "d_" and child.children[1] == -1:
+                    if int(child.children[0].name[2:]) == 0:
+                        error = True
+                        return eq
                     n = n*Fraction(1,int(child.children[0].name[2:]))
                     eq.children.pop(i)
                 elif child.name[:2] == "d_":
@@ -209,7 +218,7 @@ def simplify(eq):
                 eq = eq.children[0]
         return TreeNode(eq.name, [helper3(child) for child in eq.children])
     def helper4(eq):
-        
+        nonlocal error
         def perfect_nth_root_value(x, n):
             """Return integer y if x is a perfect n-th power (y**n == x), else None."""
             if x < 0 and n % 2 == 0:
@@ -253,7 +262,10 @@ def simplify(eq):
         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"):
-            eq = tree_form("d_0")
+            if frac(eq.children[1]) is not None and frac(eq.children[1]) <= 0:
+                error = True
+            else:
+                eq = tree_form("d_0")
         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]
         if (eq.name == "f_sin" and eq.children[0].name == "f_arcsin") or (eq.name == "f_cos" and eq.children[0].name == "f_arccos") or (eq.name == "f_tan" and eq.children[0].name == "f_arctan"):
@@ -323,4 +335,6 @@ def simplify(eq):
         return eq
     eq = dowhile(eq, fx3)
     eq = dowhile(eq, helper8)
+    if error:
+        return None
     return solve(eq)

{mathai-0.2.0 → mathai-0.2.1}/mathai/structure.py

@@ -55,7 +55,8 @@ def structure(equation, formula, formula_out=None, only_const=False):
             node.name = "f_mul"
         return TreeNode(node.name, [conversionrev(child) for child in node.children])
     equation = conversion(equation)
-    formula_out = conversion(formula_out)
+    if formula_out is not None:
+        formula_out = conversion(formula_out)
     for item in lst(formula):
         varlist = {}
         if helper(equation, item):

{mathai-0.2.0 → mathai-0.2.1}/mathai/trig.py

@@ -32,6 +32,8 @@ for key in trig_cos_table.keys():
 for key in trig_sin_table.keys():
     trig_sin_table[key] = simplify(trig_sin_table[key])
 def trig0(eq):
+    if eq is None:
+        return None
     def isneg(eq):
         if eq.name[:2] != "d_":
             return False

{mathai-0.2.0 → mathai-0.2.1}/mathai.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mathai
-Version: 0.2.0
+Version: 0.2.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.2.0 → mathai-0.2.1}/mathai.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ mathai/factor.py
 mathai/fraction.py
 mathai/integrate.py
 mathai/inverse.py
+mathai/limit.py
 mathai/linear.py
 mathai/logic.py
 mathai/parser.py

{mathai-0.2.0 → mathai-0.2.1}/setup.py

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