mathai 0.5.4__py3-none-any.whl → 0.5.5__py3-none-any.whl

mathai/simplify.py

@@ -1,408 +1,516 @@
 import math
 from .base import *
 from fractions import Fraction
-nolog = False
-def set_nolog(val):
-    global nolog
-    nolog = val
-def _solve(eq):
-    def solve_add(eq):
-        def multiplied(eq):
-            if eq.name[:2] == "d_":
-                return int(eq.name[2:]), "const"
-            if eq.name == "f_mul":
-                arth = 1
-                for i in range(len(eq.children)-1,-1,-1):
-                    if eq.children[i].name[:2] == "d_":
-                        arth *= int(eq.children[i].name[2:])
-                        eq.children.pop(i)
-                if eq.children == []:
-                    eq = "const"
-                elif len(eq.children) == 1:
-                    eq = eq.children[0]
-                return arth, eq
-            return 1, eq
-        if eq.name != "f_add":
-            return eq
-        dic = {"const":0}
-        for child in eq.children:
-            a, b = multiplied(child)
-            if b == "const":
-                dic[b] += a
-            elif b in dic.keys():
-                dic[b] += a
-            else:
-                dic[b] = a
-        summation = TreeNode("f_add", [])
-        for key in sorted(dic.keys(), key=lambda x: str_form(x)):
-            n = dic[key]
-            if n == 0:
-                continue
-            if key == "const":
-                summation.children.append(tree_form("d_"+str(n)))
+from collections import Counter
+def convert_to_basic(node):
+    if not node.name.startswith("f_"):
+        return node
+    node.children = [convert_to_basic(c) for c in node.children]
+    if node.name == "f_sub":
+        node = node.children[0]-node.children[1]
+    if node.name == "f_div":
+        node = node.children[0]/node.children[1]
+    if node.name == "f_sqrt":
+        node = node.children[0]**(tree_form("d_2")**tree_form("d_-1"))
+    return node
+
+def clear_div(eq, denom):
+    lst = factor_generation(eq)
+    if tree_form("d_0") in lst:
+        return tree_form("d_0"), True
+    lst3 = []
+    for item in lst:
+        if "v_" not in str_form(item) and compute(item) < 0:
+            lst3.append(item)
+    sign = denom
+    if len(lst3) % 2 == 1:
+        sign = False
+    if denom:
+        eq2 = []
+        eq3 = []
+        for item in lst:
+            if frac(item) is not None:#"v_" not in str_form(item):
+                eq2.append(item)
             else:
-                if n == 1:
-                    summation.children.append(key)
-                else:
-                    if key.name == "f_mul":
-                        key.children.append(tree_form("d_"+str(n)))
-                    else:
-                        key = tree_form("d_"+str(n))*key
-                    summation.children.append(key)
-        
-        if len(summation.children)==1:
-            summation = summation.children[0]
-            
-        if summation.name[:2] == "f_" and len(summation.children)==0:
-            summation = tree_form("d_0")
-        return summation
-
-    def solve_mul(eq):
-        def multiplied(eq):
-            if eq.name[:2] == "d_":
-                return int(eq.name[2:]), "const"
-            if eq.name != "f_pow" or eq.children[1].name[:2] != "d_":
-                return 1, eq
+                eq3.append(item)
+        if eq3 == []:
+            return product(eq2), True
+        return product(eq3), sign
+    lst4 = []
+    for item in lst:
+        if item.name == "f_pow":
+            tmp = frac(item.children[1])
+            if tmp is None or tmp != -1:
+                lst4.append(item)
+        else:
+            lst4.append(item)
+    lst2 = []
+    for item in lst4:
+        if frac(item) is None:#"v_" in str_form(item):
+            lst2.append(item)
+    if lst2 == []:
+        return product(lst4), sign
+    return product(lst2), sign
+'''
+def multiply_node(eq):
+    if not eq.name.startswith("f_"):
+        return eq
+    if eq.name == "f_mul":
+        con = 1
+        eq2 = TreeNode("f_mul", [])
+        for i in range(len(eq.children)-1,-1,-1):
+            if frac(eq.children[i]) is not None:
+                con = con * frac(eq.children[i])
             else:
-                return int(eq.children[1].name[2:]), eq.children[0]
-        if eq.name == "f_pow":
-            if eq.children[1] == 1:
-                return eq.children[0]
-            return eq
-        if eq.name != "f_mul":
-            return eq
-        
-        dic = {"const":1}
+                eq2.children.append(eq.children[i])
+        if con == 0:
+            return tree_form("d_0")
+        eq2.name = eq.name
+        eq = eq2
+
+        lst = {}
         for child in eq.children:
-            
-            a, b = multiplied(child)
-            if b == "const":
-                dic[b] *= a
-            elif b in dic.keys():
-                dic[b] += a
+            power = tree_form("d_1")
+            con2 = ""
+            if child.name == "f_pow":
+                con2 = child.children[0]
+                power = child.children[1]
             else:
-                dic[b] = a
-                
-        summation = TreeNode("f_mul", [])
-        if dic["const"] == 0:
-            return tree_form("d_0")
-        for key in sorted(dic.keys(), key=lambda x: str_form(x)):
-            n = dic[key]
-            if n == 0:
-                
+                con2 = child
+            if con2 in lst.keys():
+                lst[con2] = lst[con2] + power
+            else:
+                lst[con2] = power
+        eq3 = TreeNode("f_mul", [])
+
+        for kv in lst.keys():
+            tmp3 = lst[kv]
+            if tmp3 == tree_form("d_1"):
+                eq3.children.append(kv)
+            elif tmp3 == tree_form("d_0"):
                 continue
-            if key == "const":
-                if n != 1:
-                    summation.children.append(tree_form("d_"+str(n)))
             else:
-                if n== 1:
-                    summation.children.append(key)
-                else:
-                    summation.children.append(key**tree_form("d_"+str(n)))
+                eq3.children.append(kv ** tmp3)
 
-        if len(summation.children)==1:
-            summation = summation.children[0]
-        
-        if summation.name[:2] == "f_" and len(summation.children)==0:
-            summation = tree_form("d_1")
-
-        return summation
-    def solve_u(eq):
-        if eq.name in ["f_pow", "f_mul"]:
-            return solve_mul(eq)
-        return solve_add(eq)
-    def recur_solve(eq):
-        eq = solve_u(eq)
+        tmp3 = frac_to_tree(con)
+        if tmp3 != tree_form("d_1"):
+            eq3.children.append(tmp3)
+        eq = eq3
+        eq4 = TreeNode(eq.name, [])
         if eq.children == []:
-            pass
+            return tree_form("d_1")
+        if len(eq.children) == 1:
+            eq4 = eq.children[0]
+            eq = eq4         
+    return TreeNode(eq.name, [multiply_node(child) for child in eq.children])
+'''
+def multiply_node(equation):
+    """
+    Iterative version of multiply_node without using TreeNode as dict key.
+    """
+    # Stack: (node, child_index, partially_processed_children)
+    if equation is None:
+        return None
+    stack = [(equation, 0, [])]
+
+    while stack:
+        node, child_index, processed_children = stack.pop()
+
+        # If all children processed
+        if child_index >= len(node.children):
+            node.children = processed_children
+
+            # Only process multiplication nodes
+            if node.name == "f_mul":
+                # Step 1: combine numeric constants
+                con = 1
+                new_children = []
+                for child in reversed(node.children):
+                    val = frac(child)
+                    if val is not None:
+                        con *= val
+                    else:
+                        new_children.append(child)
+
+                if con == 0:
+                    node = tree_form("d_0")
+                    # Return to parent
+                    if stack:
+                        parent, idx, parent_children = stack.pop()
+                        parent_children.append(node)
+                        stack.append((parent, idx + 1, parent_children))
+                        continue
+                    else:
+                        return node
+
+                node.children = new_children
+
+                # Step 2: combine powers of same base iteratively
+                # Instead of using dict, we collect (base, exponent) in a list
+                base_powers = []
+                for child in node.children:
+                    if child.name == "f_pow":
+                        base, power = child.children
+                    else:
+                        base = child
+                        power = tree_form("d_1")
 
-        elif eq.name in ("f_add", "f_mul"):
-            merged_children = []
-            for child in eq.children:
-                if child.name == eq.name:
-                    merged_children.extend(child.children)
+                    # Look for existing base in base_powers (by structural equality)
+                    found = False
+                    for i, (b, p) in enumerate(base_powers):
+                        if b == base:  # structural equality check
+                            base_powers[i] = (b, p + power)
+                            found = True
+                            break
+                    if not found:
+                        base_powers.append((base, power))
+
+                # Step 3: rebuild multiplication node
+                new_mul = TreeNode("f_mul", [])
+                for base, power in base_powers:
+                    if power == tree_form("d_1"):
+                        new_mul.children.append(base)
+                    elif power == tree_form("d_0"):
+                        continue
+                    else:
+                        new_mul.children.append(TreeNode("f_pow", [base, power]))
+
+                # Step 4: add numeric constant
+                con_tree = frac_to_tree(con)
+                if con_tree != tree_form("d_1"):
+                    new_mul.children.append(con_tree)
+
+                # Step 5: simplify trivial cases
+                if not new_mul.children:
+                    node = tree_form("d_1")
+                elif len(new_mul.children) == 1:
+                    node = new_mul.children[0]
                 else:
-                    merged_children.append(child)
-
-            eq = TreeNode(eq.name, merged_children)
-        return TreeNode(eq.name, [recur_solve(child) for child in eq.children])
-
-    return recur_solve(eq)
-def _convert_sub2neg(eq):
-    if eq.name == "f_neg":
-        return -_convert_sub2neg(eq.children[0])
-    elif eq.name == "f_sub":
-        return _convert_sub2neg(eq.children[0]) - _convert_sub2neg(eq.children[1])
-    elif eq.name == "f_sqrt":
-        return _convert_sub2neg(eq.children[0])**(tree_form("d_2")**-1)
-    elif eq.name == "f_div":
-        if eq.children[0] == 0:
-            return tree_form("d_0")
-        return _convert_sub2neg(eq.children[0])*_convert_sub2neg(eq.children[1])**-1
-    return TreeNode(eq.name, [_convert_sub2neg(child) for child in eq.children])
-def solve(eq, specialfx=False):
-    if specialfx:
-        eq = _convert_sub2neg(eq)
-    
-    eq = flatten_tree(eq)
-    
-    return dowhile(eq, _solve)
-def solve2(eq):
-    return solve(eq, True)    
-def clear_div(eq, denom=False):
-    lst = factor_generation(eq)
-    if tree_form("d_0") in lst:
-        return tree_form("d_0"), True
-    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:
-        eq2 = [item for item in lst if "v_" not in str_form(item)]
-        eq3 = [item for item in lst if "v_" in str_form(item)]
-        if eq3 == []:
-            return solve(product(eq2)),True
-        return solve(product(eq3)),sign
-        #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)]
+                    node = new_mul
 
-    lst2 = [item for item in lst if "v_" in str_form(item)]
-    if lst2 == []:
-        return solve(product(lst)),sign
-    return solve(product(lst2)),sign
-
-def simplify(eq):
-    
-    if "v_" not in str_form(eq):
-        n = frac(eq)
-        if n is not None:
-            if n.numerator == 0:
-                return tree_form("d_0")
-            if n.denominator != 1:
-                return tree_form("d_"+str(n.numerator))/tree_form("d_"+str(n.denominator))
+            # Return node to parent
+            if stack:
+                parent, idx, parent_children = stack.pop()
+                parent_children.append(node)
+                stack.append((parent, idx + 1, parent_children))
             else:
-                return tree_form("d_"+str(n.numerator))
-    
-    if contain(eq, tree_form("s_inf")):
+                return node  # fully processed root
+
+        else:
+            # Push current node back to continue with next child
+            stack.append((node, child_index, processed_children))
+            # Push next child to stack
+            child = node.children[child_index]
+            stack.append((child, 0, []))
+'''
+def addition_node(eq):
+    if not eq.name.startswith("f_"):
         return eq
-    error = False
-    eq = flatten_tree(eq)
-    if eq.name in ["f_and", "f_or", "f_not"]:
-        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]), 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]
+    if eq.name == "f_add":
+        con = 0
+        eq2 = TreeNode("f_add", [])
+        for i in range(len(eq.children)-1,-1,-1):
+            n = frac(eq.children[i])
+            if n is not None:
+                con = con + n
+            else:
+                eq2.children.append(eq.children[i])
+        eq2.name = eq.name
+        eq = eq2
 
-        return TreeNode(name2, [tmp, tree_form("d_0")])
+        lst = {}
+        for child in eq.children:
+            power = TreeNode("f_mul", [])
+            con2 = None
+            con3 = TreeNode("f_mul", [])
+            power2 = None
 
-    eq = solve(eq, True)
-    def helper(eq):
-        
-        if eq.name == "f_pow" and  eq.children[0].name[:2] == "d_" and eq.children[1].name[:2] == "d_":
-            
-            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))
+            if child.name == "f_mul":
+                for i in range(len(child.children)):
+                    if "v_" not in str_form(child.children[i]):
+                        if child.children[i] != tree_form("d_0"):
+                            power.children.append(child.children[i])
+                    else:
+                        if child.children[i] != tree_form("d_1"):
+                            con3.children.append(child.children[i])
+                if len(con3.children) == 0:
+                    con2 = tree_form("d_1")
+                elif len(con3.children) == 1:
+                    con2 = con3.children[0]
+                else:
+                    con2 = con3
             else:
-                eq = tree_form("d_"+str(a))**-1
-        return TreeNode(eq.name, [helper(child) for child in eq.children])
-    def helper2(eq):
-        
-        def even(eq):
-            return eq.name[:2] == "d_" and int(eq.name[2:])%2==0
-        def even2(eq):
-            return any(even(item) for item in factor_generation(eq))
-        if eq.name == "f_pow" and eq.children[0].name == "f_pow":
-            if even2(eq.children[0].children[1]) or even2(eq.children[1]) and not even2(solve(eq.children[0].children[1] * eq.children[1])):
-                return eq.children[0].children[0].fx("abs") ** solve(eq.children[0].children[1] * eq.children[1])
+                con2 = child
+
+            if power.children == []:
+                power2 = tree_form("d_1")
+            elif len(power.children) == 1:
+                power2 = power.children[0]
             else:
-                return eq.children[0].children[0] ** solve(eq.children[0].children[1] * eq.children[1])
-        return TreeNode(eq.name, [helper2(child) for child in eq.children])
-    def helper3(eq):
-        
-        if eq.name == "f_mul":
-            n = Fraction(1)
-            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_":
-                    n = n*int(child.name[2:])
-                    eq.children.pop(i)
-            if n.denominator == 1:
-                eq.children.append(tree_form("d_"+str(n.numerator)))
+                power2 = power
+
+            if con2 in lst.keys():
+                lst[con2] = lst[con2] + power2
             else:
-                eq.children.append(tree_form("d_"+str(n.numerator))*tree_form("d_"+str(n.denominator))**-1)
-            
-            if len(eq.children) == 1:
-                eq = eq.children[0]
-        return TreeNode(eq.name, [helper3(child) for child in eq.children])
-    def helper4(eq):
-        nonlocal error
-        if eq == tree_form("d_-1")**tree_form("d_-1"):
-            return tree_form("d_-1")
-        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:
-                return None  # even root of negative number not real
-            
-            sign = -1 if x < 0 else 1
-            x = abs(x)
-
-            # approximate integer root
-            y = round(x ** (1.0 / n))
-            
-            if y ** n == x:
-                return sign * y
-            return None
-        def pp(eq, n):
-            if n == 1:
-                return eq
-            return eq**tree_form("d_"+str(n))
-        if eq.name == "f_pow" and eq.children[0].name[:2] == "d_" and frac(eq.children[1]) is not None:
-            f = frac(eq.children[1])
-            r = f.denominator
-            f = frac(eq.children[1]).numerator
-            if r > 1:
-                n = int(eq.children[0].name[2:])
-                if n < 0 and r==2:
-                    out = perfect_nth_root_value(-n, 2)
-                    if out is not None:
-                        return pp( tree_form("d_"+str(out))*tree_form("s_i") , f)
+                lst[con2] = power2
+        eq3 = TreeNode("f_add", [])
+
+        for kv in lst.keys():
+            tmp3 = lst[kv]
+            if tmp3 == tree_form("d_1"):
+                eq3.children.append(kv)
+            elif tmp3 == tree_form("d_0"):
+                continue
+            else:
+                eq3.children.append(kv * tmp3)
+
+        eq = eq3
+        eq4 = None
+        tmp3 = frac_to_tree(con)
+        if tmp3 != tree_form("d_0"):
+            eq.children.append(tmp3)
+        if eq.children == []:
+            return tree_form("d_0")
+        if len(eq.children) == 1:
+            eq4 = eq.children[0]
+            eq = eq4
+    return TreeNode(eq.name, [addition_node(child) for child in eq.children])
+'''
+def addition_node(equation):
+    """
+    Iterative version of addition_node.
+    Combines constants and like terms in addition nodes.
+    """
+    # Stack: (node, child_index, partially_processed_children)
+    if equation is None:
+        return None
+    stack = [(equation, 0, [])]
+
+    while stack:
+        node, child_index, processed_children = stack.pop()
+
+        # If all children are processed
+        if child_index >= len(node.children):
+            node.children = processed_children
+
+            # Only process addition nodes
+            if node.name == "f_add":
+                # Step 1: combine numeric constants
+                con = 0
+                new_children = []
+                for child in reversed(node.children):
+                    val = frac(child)
+                    if val is not None:
+                        con += val
+                    else:
+                        new_children.append(child)
+
+                node.children = new_children
+
+                # Step 2: combine like terms iteratively
+                # We store (base, power) pairs in a list (avoid dict/hash)
+                base_terms = []
+                for child in node.children:
+                    # Decompose child into base and multiplier
+                    power_node = TreeNode("f_mul", [])
+                    base_node = None
+                    mul_node = TreeNode("f_mul", [])
+                    multiplier_node = None
+
+                    if child.name == "f_mul":
+                        for c in child.children:
+                            if frac(c) is not None:  # constant part
+                                if c != tree_form("d_0"):
+                                    power_node.children.append(c)
+                            else:  # variable part
+                                if c != tree_form("d_1"):
+                                    mul_node.children.append(c)
+                        if len(mul_node.children) == 0:
+                            base_node = tree_form("d_1")
+                        elif len(mul_node.children) == 1:
+                            base_node = mul_node.children[0]
+                        else:
+                            base_node = mul_node
+                    else:
+                        base_node = child
+
+                    if not power_node.children:
+                        multiplier_node = tree_form("d_1")
+                    elif len(power_node.children) == 1:
+                        multiplier_node = power_node.children[0]
                     else:
-                        return pp( (tree_form("d_"+str(-n))**(tree_form("d_2")**-1))*tree_form("s_i"), f)
+                        multiplier_node = power_node
+
+                    # Combine like terms structurally
+                    found = False
+                    for i, (b, m) in enumerate(base_terms):
+                        if b == base_node:
+                            base_terms[i] = (b, m + multiplier_node)
+                            found = True
+                            break
+                    if not found:
+                        base_terms.append((base_node, multiplier_node))
+
+                # Step 3: rebuild addition node
+                new_add = TreeNode("f_add", [])
+                for base, multiplier in base_terms:
+                    if multiplier == tree_form("d_1"):
+                        new_add.children.append(base)
+                    elif multiplier == tree_form("d_0"):
+                        continue
+                    else:
+                        new_add.children.append(base * multiplier)
+
+                # Step 4: add numeric constant
+                con_tree = frac_to_tree(con)
+                if con_tree != tree_form("d_0"):
+                    new_add.children.append(con_tree)
+
+                # Step 5: simplify trivial cases
+                if not new_add.children:
+                    node = tree_form("d_0")
+                elif len(new_add.children) == 1:
+                    node = new_add.children[0]
                 else:
-                    out = perfect_nth_root_value(n, r)
-                    if out is not None:
-                        return pp( tree_form("d_"+str(out)), f)
-        if not nolog:
-            if eq.name == "f_mul" and len(eq.children)== 2:
-                for i in range(2):
-                    if eq.children[i].name[:2] == "d_" and eq.children[1-i].name == "f_log":
-                        return (eq.children[1-i].children[0]**eq.children[i]).fx("log")
-            if eq.name == "f_pow" and eq.children[0] == tree_form("s_e") and eq.children[1].name == "f_log":
-                return eq.children[1].children[0]
-            
-        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"):
-            if frac(eq.children[1]) is not None and frac(eq.children[1]) <= 0:
-                error = True
+                    node = new_add
+
+            # Return node to parent
+            if stack:
+                parent, idx, parent_children = stack.pop()
+                parent_children.append(node)
+                stack.append((parent, idx + 1, parent_children))
             else:
-                eq = tree_form("d_0")
-                
-        if eq.name =="f_pow" and eq.children[0] == tree_form("s_i") and frac(eq.children[1])is not None and frac(eq.children[1]).denominator == 1:
-            n = frac(eq.children[1]).numerator
-            eq = {0:tree_form("d_1"), 1:tree_form("s_i"), 2:tree_form("d_-1"), 3:-tree_form("s_i")}[n%4]
-        if eq.name == "f_mul":
-            dic = {}
-            for child in eq.children:
-                head = child
-                tail = None
-                if child.name == "f_pow":
-                    head = child.children[0]
-                    tail = child.children[1]
-                if tail is None:
-                    tail = tree_form("d_1")
-                if head not in dic.keys():
-                    dic[head] = tail
-                else:
-                    dic[head] += tail
-            if len(eq.children) > len(dic.keys()):
-                eq = product([key if dic[key] == 1 else key**dic[key] for key in dic.keys()])
-        if eq.name == "f_abs" and eq.children[0].name == "f_pow" and frac(eq.children[0].children[1]) == Fraction(1,2):
-            eq = eq.children[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"):
-            eq = eq.children[0].children[0]
-        if (eq.name == "f_cos" and eq.children[0].name == "f_arcsin") or (eq.name == "f_sin" and eq.children[0].name == "f_arccos"):
-            eq2 = eq.children[0].children[0]
-            eq2 = (tree_form("d_1") - eq2*eq2)**(tree_form("d_1")/tree_form("d_2"))
-            eq = eq2
-        if (eq.name == "f_arcsin" and eq.children[0].name == "f_sin") or (eq.name == "f_arccos" and eq.children[0].name == "f_cos") or (eq.name == "f_arctan" and eq.children[0].name == "f_tan"):
-            eq = eq.children[0].children[0]
-        if eq.name == "f_abs" and eq.children[0].name[:2] == "d_":
-            eq = tree_form("d_"+str(abs(int(eq.children[0].name[2:]))))
-        if eq.name == "f_abs" and "v_" not in str_form(eq.children[0]):
-            if compute(eq.children[0]) > 0.00001:
-                eq = eq.children[0]
-            elif compute(eq.children[0]) < 0.00001:
-                eq = -eq.children[0]
-        if eq.name == "f_pow" and  eq.children[0].name[:2] == "d_" and frac(eq.children[1]) is not None:
-            f = frac(eq.children[1])
-            if f.denominator != 1:
-                return helper(eq.children[0]**tree_form("d_"+str(f.numerator)))**(tree_form("d_"+str(f.denominator))**-1)
-        
-        return TreeNode(eq.name, [helper4(child) for child in eq.children])
-    
-    def helper7(eq):
-        
-        if eq.name == "f_pow" and eq.children[0].name == "f_mul":
-            return product([child**eq.children[1] for child in eq.children[0].children])
-        return TreeNode(eq.name, [helper7(child) for child in eq.children])
-    
-    def helper6(eq):
-        if eq.name == "f_mul":
-            lst = factor_generation(eq)
-            rm = []
-            for i in range(len(lst)):
-                if i in rm:
-                    continue
-                for j in range(len(lst)):
-                    if i ==j or j in rm:
-                        continue
-                    if solve(helper2(lst[i]**-1)) == lst[j]:
-                        rm += [i,j]
-                        break
-            if rm != []:
-                for item in sorted(rm)[::-1]:
-                    lst.pop(item)
-                return product(lst)
-        return TreeNode(eq.name, [helper6(child) for child in eq.children])
-    def helper5(eq):
-        
-        if eq.name == "f_pow" and eq.children[1].name[:2] == "d_" and abs(int(eq.children[1].name[2:]))%2==0 and eq.children[0].name == "f_abs":
-            return eq.children[0].children[0]**eq.children[1]
-        return TreeNode(eq.name, [helper5(child) for child in eq.children])
-    def helper8(eq):
-        if eq.name == "f_pow" and eq.children[0].name == "f_abs" and frac(eq.children[1]) is not None and frac(eq.children[1]).numerator % 2==0:
-            return eq.children[0].children[0] ** eq.children[1]
-        if eq.name == "f_abs" and eq.children[0].name == "f_abs":
-            return eq.children[0]
-        if eq.name == "f_cos" and eq.children[0].name == "f_abs":
-            return eq.children[0].children[0].fx("cos")
-        return TreeNode(eq.name, [helper8(child) for child in eq.children])
-    def fx1(eq):
-        for item in [helper, helper3, helper4, helper6,solve,helper2,helper5]:
-            eq = dowhile(eq, item)
-        return eq
-    def fx2(eq):
-        for item in [helper, helper3, helper4, helper6,helper7,helper2,helper5]:
-            eq = dowhile(eq, item)
-        return eq
-    def fx3(eq):
-        for item in [fx1, fx2]:
-            eq = dowhile(eq, item)
-        return eq
-    eq = dowhile(eq, fx3)
-    eq = dowhile(eq, helper8)
-    if error:
+                # Root node fully processed
+                return node
+
+        else:
+            # Push current node back for next child
+            stack.append((node, child_index, processed_children))
+            # Push next child to stack
+            child = node.children[child_index]
+            stack.append((child, 0, []))
+
+def other_node(eq):
+    if eq is None:
         return None
-    return solve(eq)
+    if eq.name == "f_log":
+        if len(eq.children) == 1:
+            if eq.children[0].name == "d_1":
+                return tree_form("d_0")
+            if eq.children[0].name == "s_e":
+                return tree_form("d_1")
+    if eq.name == "f_mul":
+        if tree_form("d_1") in eq.children:
+            return product([remove_extra(child) for child in eq.children if child != tree_form("d_1")])
+    if eq.name == "f_pow" and len(eq.children) == 2:
+        a, b = frac(eq.children[0]), frac(eq.children[1])
+        if a is not None and b is not None and a == 0 and b < 0:
+            return None
+        if eq.children[1].name == "d_0":
+            return tree_form("d_1")
+        if eq.children[1].name == "d_1":
+            return eq.children[0]
+        if eq.children[0].name == "d_1":
+            return tree_form("d_1")
+        if eq.children[0].name == "f_abs" and eq.children[1].name.startswith("d_")\
+           and int(eq.children[1].name[2:]) % 2 == 0:
+            return eq.children[0].children[0] ** eq.children[1]
+        
+        if eq.children[0].name == "f_mul":
+            n = frac(eq.children[1])
+            if n is not None and n < 0 and n.numerator % 2 == 1 and n.denominator == 1:
+                n2 = frac_to_tree(-n)
+                if n2 == tree_form("d_1"):
+                    return product([child**-1 for child in eq.children[0].children])
+                return product([child**-1 for child in eq.children[0].children]) ** n2
+        if frac(eq.children[1]) == Fraction(1,2):
+            d = frac(eq.children[0])
+            if d is not None and d < 0:
+                return tree_form("s_i")*(frac_to_tree(-d)**eq.children[1])
+        if eq.children[0].name == "f_pow":
+            b = eq.children[0].children[1]
+            c = eq.children[1]
+            out = frac(b*c)
+            if out is not None:
+                out2 = frac(b)
+                if out.numerator % 2 == 0 or out2.numerator % 2 != 0:
+                    return eq.children[0].children[0] ** (b*c)
+                else:
+                    return eq.children[0].children[0].fx("abs") ** (b*c)
+            else:
+                tmp = compute(eq.children[0].children[0])
+                if (tmp is not None and tmp > 0) or eq.children[0].children[0].name == "f_abs":
+                    return eq.children[0].children[0] ** (b*c)
+    c = frac(eq)
+    if c is not None:
+        c = frac_to_tree(c)
+        if c != eq:
+            return c
+    if eq.name == "f_pow" and eq.children[0] == tree_form("s_i") and eq.children[1].name.startswith("d_"):
+        n = int(eq.children[1].name[2:])
+        if n % 4 == 0:
+            return tree_form("d_1")
+        if n % 4 == 1:
+            return tree_form("s_i")
+        if n % 4 == 2:
+            return tree_form("d_-1")
+        if n % 4 == 3:
+            return -tree_form("s_i")
+    if eq.name == "f_pow" and eq.children[0].name == "s_e":
+        if eq.children[1].name == "f_log":
+            return eq.children[1].children[0]
+        if eq.children[1].name == "f_mul":
+            lst = factor_generation(eq.children[1])
+            log = None
+            for i in range(len(lst)-1,-1,-1):
+                if lst[i].name == "f_log":
+                    log = lst[i]
+                    lst.pop(i)
+                    break
+            if log is not None:
+                return log.children[0] ** product(lst)
+    return TreeNode(eq.name, [other_node(child) for child in eq.children])
+def cancel(eq):
+    n, d = num_dem(eq)
+    d = simplify(d)
+    if d != tree_form("d_1"):
+        n = simplify(n)
+        a = Counter(factor_generation(n))
+        b = Counter(factor_generation(d))
+        c = a & b
+        a = simplify(product(list(a-c)))
+        b = simplify(product(list(b-c)))
+        if b == tree_form("d_1"):
+            return a
+        if a == tree_form("d_1"):
+            return b ** -1
+        return a/b
+    return TreeNode(eq.name, [cancel(child) for child in eq.children])
+def solve3(eq):
+    a = lambda x: multiply_node(x)
+    b = lambda x: addition_node(x)
+    c = lambda x: other_node(x)
+    return dowhile(eq, lambda x: c(b(a(x))))
 
+def simplify(eq, basic=True):
+    if eq is None:
+        return None
+    if eq.name == "f_and" or eq.name == "f_not" or eq.name == "f_or":
+        new_children = []
+        for child in eq.children:
+            new_children.append(simplify(child))
+        return TreeNode(eq.name, new_children)
+    if eq.name[2:] in "gt ge lt le eq".split(" "):
+        denom = eq.name != "f_eq"
+        tmp2 = simplify(eq.children[0] - eq.children[1])
+        tmp, denom = clear_div(tmp2, denom)
+        tmp = simplify(tmp)
+        value2 = eq.name[2:]
+        if denom is False:
+            value2 = {"ge":"le", "le":"ge", "gt":"lt", "lt":"gt", "eq":"eq"}[value2]
+        value2 = "f_"+value2
+        return TreeNode(value2, [tmp, tree_form("d_0")])
+    eq = flatten_tree(eq)
+    if basic:
+        eq = convert_to_basic(eq)
+    return solve3(eq)