Merge pull request #646 from isaacsas/fix-plots-names

Fix names in plot legends

Author: isaacsas

src/systems/diffeqs/abstractodesystem.jl

@@ -158,12 +158,13 @@ function DiffEqBase.ODEFunction{iip}(sys::AbstractODESystem, dvs = states(sys),
 
     _M = (u0 === nothing || M == I) ? M : ArrayInterface.restructure(u0 .* u0',M)
 
+    sts = states(sys)
     ODEFunction{iip}(f,
                      jac = _jac === nothing ? nothing : _jac,
                      tgrad = _tgrad === nothing ? nothing : _tgrad,
                      mass_matrix = _M,
                      jac_prototype = sparse ? similar(sys.jac[],Float64) : nothing,
-                     syms = Symbol.(states(sys)))
+                     syms = tosymbol.(sts, states=sts, escape=false))
 end
 
 """
@@ -214,18 +215,18 @@ function ODEFunctionExpr{iip}(sys::AbstractODESystem, dvs = states(sys),
 
     jp_expr = sparse ? :(similar($(sys.jac[]),Float64)) : :nothing
 
+    sts = states(sys)
     ex = quote
         f = $f
         tgrad = $_tgrad
         jac = $_jac
         M = $_M
-
         ODEFunction{$iip}(f,
                          jac = jac,
                          tgrad = tgrad,
                          mass_matrix = M,
                          jac_prototype = $jp_expr,
-                         syms = $(Symbol.(states(sys))))
+                         syms = $(tosymbol.(sts, states=sts, escape=false)))
     end
     !linenumbers ? striplines(ex) : ex
 end

src/systems/diffeqs/sdesystem.jl

@@ -190,13 +190,14 @@ function DiffEqBase.SDEFunction{iip}(sys::SDESystem, dvs = sys.states, ps = sys.
     M = calculate_massmatrix(sys)
     _M = (u0 === nothing || M == I) ? M : ArrayInterface.restructure(u0 .* u0',M)
 
+    sts = states(sys)
     SDEFunction{iip}(f,g,
                      jac = _jac === nothing ? nothing : _jac,
                      tgrad = _tgrad === nothing ? nothing : _tgrad,
                      Wfact = _Wfact === nothing ? nothing : _Wfact,
                      Wfact_t = _Wfact_t === nothing ? nothing : _Wfact_t,
                      mass_matrix = _M,
-                     syms = Symbol.(sys.states))
+                     syms = tosymbol.(sts, states=sts, escape=false))
 end
 
 function DiffEqBase.SDEFunction(sys::SDESystem, args...; kwargs...)
@@ -254,6 +255,7 @@ function SDEFunctionExpr{iip}(sys::SDESystem, dvs = states(sys),
 
     _M = (u0 === nothing || M == I) ? M : ArrayInterface.restructure(u0 .* u0',M)
 
+    sts = states(sys)
     ex = quote
         f = $f
         g = $g
@@ -262,14 +264,13 @@ function SDEFunctionExpr{iip}(sys::SDESystem, dvs = states(sys),
         Wfact = $_Wfact
         Wfact_t = $_Wfact_t
         M = $_M
-
         SDEFunction{$iip}(f,g,
                          jac = jac,
                          tgrad = tgrad,
                          Wfact = Wfact,
                          Wfact_t = Wfact_t,
                          mass_matrix = M,
-                         syms = $(Symbol.(states(sys))),kwargs...)
+                         syms = $(tosymbol.(sts, states=sts, escape=false)),kwargs...)
     end
     !linenumbers ? striplines(ex) : ex
 end

src/systems/jumps/jumpsystem.jl

@@ -197,7 +197,8 @@ function DiffEqBase.DiscreteProblem(sys::JumpSystem, u0map, tspan::Tuple,
         p = parammap
     end
     f  = DiffEqBase.DISCRETE_INPLACE_DEFAULT
-    df = DiscreteFunction(f, syms=Symbol.(states(sys)))
+    sts = states(sys)
+    df = DiscreteFunction{true,true}(f, syms=tosymbol.(sts, states=sts, escape=false))
     DiscreteProblem(df, u0, tspan, p; kwargs...)
 end
 
@@ -225,12 +226,13 @@ function DiscreteProblemExpr(sys::JumpSystem, u0map, tspan::Tuple,
     u0 = varmap_to_vars(u0map, states(sys))
     p  = varmap_to_vars(parammap, parameters(sys))
     # identity function to make syms works
+    sts = states(sys)
     quote
         f  = DiffEqBase.DISCRETE_INPLACE_DEFAULT
         u0 = $u0
         p = $p
         tspan = $tspan
-        df = DiscreteFunction(f, syms=$(Symbol.(states(sys))))
+        df = DiscreteFunction{true,true}(f, syms=$(tosymbol.(sts, states=sts, escape=false)))
         DiscreteProblem(df, u0, tspan, p; kwargs...)
     end
 end