mathai 0.2.4__tar.gz → 0.2.7__tar.gz

{mathai-0.2.4 → mathai-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mathai
-Version: 0.2.4
+Version: 0.2.7
 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.4 → mathai-0.2.7}/mathai/simplify.py

@@ -146,14 +146,17 @@ def solve(eq, specialfx=False):
     return dowhile(eq, _solve)
 def solve2(eq):
     return solve(eq, True)    
-def clear_div(eq):
+def clear_div(eq, denom=False):
     lst = factor_generation(eq)
     if tree_form("d_0") in lst:
         return tree_form("d_0")
     lst3 = [item for item in lst if "v_" not in str_form(item) and compute(item) < 0]
+    
     sign = True
     if len(lst3) % 2 == 1:
         sign = False
+    if denom:
+        return eq if sign else -eq, sign
     lst = [item for item in lst if not(item.name == "f_pow" and frac(item.children[1]) is not None and frac(item.children[1]) == -1)]
 
     lst2 = [item for item in lst if "v_" in str_form(item)]
@@ -168,7 +171,7 @@ def simplify(eq):
         return TreeNode(eq.name, [simplify(child) for child in eq.children])
         
     if eq.name in ["f_lt", "f_gt", "f_le", "f_ge", "f_eq"]:
-        tmp, sign = clear_div(simplify(eq.children[0]-eq.children[1]))
+        tmp, sign = clear_div(simplify(eq.children[0]-eq.children[1]), eq.name != "f_eq")
         name2 = eq.name
         if not sign:
             name2 = {"f_lt":"f_gt", "f_gt":"f_lt", "f_eq":"f_eq", "f_le":"f_ge", "f_ge":"f_le"}[name2]

{mathai-0.2.4 → mathai-0.2.7}/mathai/univariate_inequality.py

@@ -262,9 +262,9 @@ def helper(eq, var="v_0"):
             out = inverse(item, vlist(item)[0])
             critical.append(out)
             if equ:
-                equal.append(str_form(out))
-    equal = list(set([simplify(tree_form(item)) for item in equal]))
-    more = list(set([simplify(tree_form(item)) for item in more]))
+                equal.append(out)
+    equal = list(set([simplify(item) for item in equal]))
+    more = list(set([simplify(item) for item in more]))
     critical = [simplify(item) for item in critical]
     critical = Counter(critical)
     
@@ -365,9 +365,8 @@ def absolute(equation):
         equation = TreeNode("f_or", out2)
     return equation
 def handle_sqrt(eq):
-    eq = domain(eq)
     def helper2(eq):
-        if eq.name in ["f_lt", "f_gt", "f_le", "f_ge"]:
+        if eq.name in ["f_lt", "f_gt", "f_le", "f_ge","f_eq"]:
             out = []
             def helper(eq):
                 nonlocal out
@@ -376,15 +375,15 @@ def handle_sqrt(eq):
                 x = [helper(child) for child in eq.children]
             helper(eq)
             for item in out:
-                
-                eq2, sgn = inverse(simplify(eq.children[0]), str_form(item), True)
                 n = tree_form("d_1")
-                if sgn == False:
-                    n = tree_form("d_-1")
+                if eq.name == "f_eq":
+                    eq2 = inverse(simplify(eq.children[0]), str_form(item))
+                else:
+                    eq2, sgn = inverse(simplify(eq.children[0]), str_form(item), True)
+                    if sgn == False:
+                        n = tree_form("d_-1")
                 eq3 = simplify(expand(simplify(eq2**2)))
-                eq2 = simplify(eq2)
-                if "v_" in str_form(eq3) and not (eq2.name == "f_pow" and frac(eq2.children[1]) == Fraction(1,2)):
-                    return simplify(TreeNode(eq.name, [simplify(n*item.children[0]-eq3*n), tree_form("d_0")])) & TreeNode("f_ge", [eq2, tree_form("d_0")])
+                
                 return simplify(TreeNode(eq.name, [simplify(n*item.children[0]-eq3*n), tree_form("d_0")]))
         return TreeNode(eq.name, [helper2(child) for child in eq.children])
     return helper2(eq)
@@ -394,9 +393,13 @@ def domain(eq):
     def helper2(eq):
         nonlocal out
         if eq.name == "f_pow" and frac(eq.children[1]) is not None and frac(eq.children[1]).denominator == 2:
-            out.append(TreeNode("f_ge", [eq.children[0], tree_form("d_0")]))
+            if "v_" in str_form(eq.children[0]):
+                out.append(TreeNode("f_ge", [eq.children[0], tree_form("d_0")]))
+                out.append(TreeNode("f_ge", [eq, tree_form("d_0")]))
         if eq.name == "f_pow" and frac(eq.children[1]) is not None and frac(eq.children[1]) <0:
-            out.append(TreeNode("f_eq", [eq.children[0], tree_form("d_0")]).fx("not"))
+            tmp = TreeNode("f_eq", [eq.children[0], tree_form("d_0")]).fx("not")
+            if "v_" in str_form(tmp):
+                out.append(tmp)
         x = [helper2(child) for child in eq.children]
     helper2(eq)
     out = list(set([simplify(item) for item in out]))

{mathai-0.2.4 → mathai-0.2.7}/mathai.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mathai
-Version: 0.2.4
+Version: 0.2.7
 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.4 → mathai-0.2.7}/setup.py

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