lower bound SymbolicUtils

Author: shashi

Project.toml

@@ -35,6 +35,7 @@ NaNMath = "0.3"
 SafeTestsets = "0.0.1"
 SpecialFunctions = "0.7, 0.8, 0.9, 0.10"
 StaticArrays = "0.10, 0.11, 0.12"
+SymbolicUtils = "0.1.1"
 TreeViews = "0.3"
 UnPack = "0.1"
 Unitful = "1.1"

src/simplify.jl

@@ -15,21 +15,21 @@ end
 # This is required to infer the right type for
 # Operation(Variable{Parameter{Number}}(:foo), [])
 # While keeping the metadata that the variable is a parameter.
-SymbolicUtils.promote_symtype(f::SymbolicUtils.Variable{FnType{X,Parameter{Y}}},
+SymbolicUtils.promote_symtype(f::SymbolicUtils.Sym{FnType{X,Parameter{Y}}},
                               xs...) where {X, Y} = Y
 
 SymbolicUtils.arguments(x::Operation) = x.args
 
 # SymbolicUtils wants raw numbers
 SymbolicUtils.to_symbolic(x::Constant) = x.value
-SymbolicUtils.to_symbolic(x::Variable{T}) where {T} = SymbolicUtils.Variable{T}(x.name)
+SymbolicUtils.to_symbolic(x::Variable{T}) where {T} = SymbolicUtils.Sym{T}(x.name)
 
 # Optional types of vars
 # Once converted to SymbolicUtils Variable, a Parameter needs to hide its metadata
 _vartype(x::Variable{<:Parameter{T}}) where {T} = T
 _vartype(x::Variable{T}) where {T} = T
 SymbolicUtils.symtype(x::Variable) = _vartype(x) # needed for a()
-SymbolicUtils.symtype(x::SymbolicUtils.Variable{<:Parameter{T}}) where {T} = T
+SymbolicUtils.symtype(x::SymbolicUtils.Sym{<:Parameter{T}}) where {T} = T
 
 # returning Any causes SymbolicUtils to infer the type using `promote_symtype`
 # But we are OK with Number here for now I guess
@@ -44,8 +44,8 @@ end
 
 to_mtk(x) = x
 to_mtk(x::Number) = Constant(x)
-to_mtk(v::SymbolicUtils.Variable{T}) where {T} = Variable{T}(nameof(v))
-to_mtk(v::SymbolicUtils.Variable{FnType{X,Y}}) where {X,Y} = Variable{Y}(nameof(v))
+to_mtk(v::SymbolicUtils.Sym{T}) where {T} = Variable{T}(nameof(v))
+to_mtk(v::SymbolicUtils.Sym{FnType{X,Y}}) where {X,Y} = Variable{Y}(nameof(v))
 function to_mtk(expr::SymbolicUtils.Term)
     Operation(to_mtk(SymbolicUtils.operation(expr)),
               map(to_mtk, SymbolicUtils.arguments(expr)))