extend tosymbol

Author: isaacsas

src/systems/diffeqs/abstractodesystem.jl

@@ -163,7 +163,7 @@ function DiffEqBase.ODEFunction{iip}(sys::AbstractODESystem, dvs = states(sys),
                      tgrad = _tgrad === nothing ? nothing : _tgrad,
                      mass_matrix = _M,
                      jac_prototype = sparse ? similar(sys.jac[],Float64) : nothing,
-                     syms = nameof.(operation.(states(sys))))
+                     syms = tosymbol.(states(sys)))
 end
 
 """
@@ -225,7 +225,7 @@ function ODEFunctionExpr{iip}(sys::AbstractODESystem, dvs = states(sys),
                          tgrad = tgrad,
                          mass_matrix = M,
                          jac_prototype = $jp_expr,
-                         syms = $(nameof.(operation.(states(sys)))))
+                         syms = $(tosymbol.(states(sys))))
     end
     !linenumbers ? striplines(ex) : ex
 end

src/systems/diffeqs/sdesystem.jl

@@ -196,7 +196,7 @@ function DiffEqBase.SDEFunction{iip}(sys::SDESystem, dvs = sys.states, ps = sys.
                      Wfact = _Wfact === nothing ? nothing : _Wfact,
                      Wfact_t = _Wfact_t === nothing ? nothing : _Wfact_t,
                      mass_matrix = _M,
-                     syms = nameof.(operation.(states(sys))))
+                     syms = tosymbol.(states(sys)))
 end
 
 function DiffEqBase.SDEFunction(sys::SDESystem, args...; kwargs...)
@@ -269,7 +269,7 @@ function SDEFunctionExpr{iip}(sys::SDESystem, dvs = states(sys),
                          Wfact = Wfact,
                          Wfact_t = Wfact_t,
                          mass_matrix = M,
-                         syms = $(nameof.(operation.(states(sys)))),kwargs...)
+                         syms = $(tosymbol.(states(sys))),kwargs...)
     end
     !linenumbers ? striplines(ex) : ex
 end

src/systems/jumps/jumpsystem.jl

@@ -197,7 +197,7 @@ function DiffEqBase.DiscreteProblem(sys::JumpSystem, u0map, tspan::Tuple,
         p = parammap
     end
     f  = DiffEqBase.DISCRETE_INPLACE_DEFAULT
-    df = DiscreteFunction{true,true}(f, syms=nameof.(operation.(states(sys))))
+    df = DiscreteFunction{true,true}(f, syms=tosymbol.(states(sys)))
     DiscreteProblem(df, u0, tspan, p; kwargs...)
 end
 
@@ -230,7 +230,7 @@ function DiscreteProblemExpr(sys::JumpSystem, u0map, tspan::Tuple,
         u0 = $u0
         p = $p
         tspan = $tspan
-        df = DiscreteFunction{true,true}(f, syms=$(nameof.(operation.(states(sys)))))
+        df = DiscreteFunction{true,true}(f, syms=$(tosymbol.(states(sys))))
         DiscreteProblem(df, u0, tspan, p; kwargs...)
     end
 end

src/utils.jl

@@ -159,6 +159,7 @@ tovar(s::Sym) = s
 Base.Symbol(x::Union{Num,Symbolic}) = tosymbol(x)
 tosymbol(x; kwargs...) = x
 tosymbol(x::Sym; kwargs...) = nameof(x)
+tosymbol(x::Term; kwargs...) = nameof(operation(x))
 tosymbol(t::Num; kwargs...) = tosymbol(value(t); kwargs...)
 
 """