Define get_base

Author: bowenszhu

src/polyform.jl

@@ -268,7 +268,7 @@ function polyform_factors(d, pvar2sym, sym2term)
         if ispow(x) && x.impl.exp isa Integer && x.impl.exp > 0
             # here we do want to recurse one level, that's why it's wrong to just
             # use Fs = Union{typeof(+), typeof(*)} here.
-            _Pow(PolyForm(x.impl.base, pvar2sym, sym2term), x.impl.exp)
+            _Pow(PolyForm(get_base(x), pvar2sym, sym2term), x.impl.exp)
         else
             PolyForm(x, pvar2sym, sym2term)
         end
@@ -416,8 +416,8 @@ But it will simplify `(x - 5)^2*(x - 3) / (x - 5)` to `(x - 5)*(x - 3)`.
 Has optimized processes for `Mul` and `Pow` terms.
 """
 function quick_cancel(d)
-    if ispow(d) && isdiv(d.impl.base)
-        return quick_cancel((get_num(d.impl.base)^d.impl.exp) / (get_den(d.impl.base)^d.impl.exp))
+    if ispow(d) && isdiv(get_base(d))
+        return quick_cancel((get_num(get_base(d))^d.impl.exp) / (get_den(get_base(d))^d.impl.exp))
     elseif ismul(d) && any(isdiv, arguments(d))
         return prod(arguments(d))
     elseif isdiv(d)
@@ -502,17 +502,17 @@ end
 # mul, pow case
 function quick_mulpow(x, y)
     y.impl.exp isa Number || return (x, y)
-    if haskey(get_dict(x), y.impl.base)
+    if haskey(get_dict(x), get_base(y))
         d = copy(get_dict(x))
-        if get_dict(x)[y.impl.base] > y.impl.exp
-            d[y.impl.base] -= y.impl.exp
+        if get_dict(x)[get_base(y)] > y.impl.exp
+            d[get_base(y)] -= y.impl.exp
             den = 1
-        elseif get_dict(x)[y.impl.base] == y.impl.exp
-            delete!(d, y.impl.base)
+        elseif get_dict(x)[get_base(y)] == y.impl.exp
+            delete!(d, get_base(y))
             den = 1
         else
-            den = _Pow(symtype(y), y.impl.base, y.impl.exp-d[y.impl.base])
-            delete!(d, y.impl.base)
+            den = _Pow(symtype(y), get_base(y), y.impl.exp-d[get_base(y)])
+            delete!(d, get_base(y))
         end
         return _Mul(symtype(x), get_coeff(x), d), den
     else

src/types.jl

@@ -84,6 +84,10 @@ function get_den(x::BasicSymbolic)
     x.impl.den
 end
 
+function get_base(x::BasicSymbolic)
+    x.impl.base
+end
+
 # Same but different error messages
 @noinline error_on_type() = error("Internal error: unreachable reached!")
 @noinline error_sym() = error("Sym doesn't have a operation or arguments!")
@@ -313,7 +317,7 @@ function _isequal(a, b, E)
     elseif E === DIV
         isequal(get_num(a), get_num(b)) && isequal(get_den(a), get_den(b))
     elseif E === POW
-        isequal(a.impl.exp, b.impl.exp) && isequal(a.impl.base, b.impl.base)
+        isequal(a.impl.exp, b.impl.exp) && isequal(get_base(a), get_base(b))
     elseif E === TERM
         a1 = arguments(a)
         a2 = arguments(b)
@@ -359,7 +363,7 @@ function Base.hash(s::BasicSymbolic, salt::UInt)::UInt
     elseif E === DIV
         return hash(get_num(s), hash(get_den(s), salt ⊻ DIV_SALT))
     elseif E === POW
-        hash(s.impl.exp, hash(s.impl.base, salt ⊻ POW_SALT))
+        hash(s.impl.exp, hash(get_base(s), salt ⊻ POW_SALT))
     elseif E === TERM
         !iszero(salt) && return hash(hash(s, zero(UInt)), salt)
         h = s.hash[]
@@ -562,7 +566,7 @@ function toterm(t::BasicSymbolic{T}) where {T}
     elseif E === DIV
         _Term(T, /, [get_num(t), get_den(t)])
     elseif E === POW
-        _Term(T, ^, [t.impl.base, t.impl.exp])
+        _Term(T, ^, [get_base(t), t.impl.exp])
     else
         error_on_type()
     end
@@ -605,7 +609,7 @@ end
 function makemul(coeff, xs...; d = Dict{BasicSymbolic, Any}())
     for x in xs
         if ispow(x) && x.impl.exp isa Number
-            d[x.impl.base] = x.impl.exp + get(d, x.impl.base, 0)
+            d[get_base(x)] = x.impl.exp + get(d, get_base(x), 0)
         elseif x isa Number
             coeff *= x
         elseif ismul(x)
@@ -629,7 +633,7 @@ function makepow(a, b)
     base = a
     exp = b
     if ispow(a)
-        base = a.impl.base
+        base = get_base(a)
         exp = a.impl.exp * b
     end
     base, exp
@@ -1311,7 +1315,7 @@ function *(a::SN, b::SN)
         if b.impl.exp isa Number
             _Mul(mul_t(a, b),
                 get_coeff(a),
-                _merge(+, get_dict(a), Base.ImmutableDict(b.impl.base => b.impl.exp),
+                _merge(+, get_dict(a), Base.ImmutableDict(get_base(b) => b.impl.exp),
                     filter = _iszero))
         else
             _Mul(mul_t(a, b), get_coeff(a),