Merge pull request #702 from SciML/varmap

Simplify type handling in non-concrete varmap

Author: ChrisRackauckas

src/systems/reaction/reactionsystem.jl

@@ -487,24 +487,18 @@ end
 
 # ODEProblem from AbstractReactionNetwork
 function DiffEqBase.ODEProblem(rs::ReactionSystem, u0::Union{AbstractArray, Number}, tspan, p=DiffEqBase.NullParameters(), args...; kwargs...)
-    u0 = typeof(u0) <: Array{<:Pair} ? u0 : Pair.(rs.states,u0)
-    p = typeof(p) <: Union{Array{<:Pair},DiffEqBase.NullParameters} ? p : Pair.(rs.ps,p)
     return ODEProblem(convert(ODESystem,rs),u0,tspan,p, args...; kwargs...)
 end
 
 # SDEProblem from AbstractReactionNetwork
 function DiffEqBase.SDEProblem(rs::ReactionSystem, u0::Union{AbstractArray, Number}, tspan, p=DiffEqBase.NullParameters(), args...; noise_scaling=nothing, kwargs...)
     sde_sys = convert(SDESystem,rs,noise_scaling=noise_scaling)
-    u0 = typeof(u0) <: Array{<:Pair} ? u0 : Pair.(rs.states,u0)
-    p = typeof(p) <: Union{Array{<:Pair},DiffEqBase.NullParameters} ? p : Pair.(sde_sys.ps,p)
     p_matrix = zeros(length(rs.states), length(rs.eqs))
     return SDEProblem(sde_sys,u0,tspan,p,args...; noise_rate_prototype=p_matrix,kwargs...)
 end
 
 # DiscreteProblem from AbstractReactionNetwork
 function DiffEqBase.DiscreteProblem(rs::ReactionSystem, u0::Union{AbstractArray, Number}, tspan::Tuple, p=DiffEqBase.NullParameters(), args...; kwargs...)
-    u0 = typeof(u0) <: Array{<:Pair} ? u0 : Pair.(rs.states,u0)
-    p = typeof(p) <: Union{Array{<:Pair},DiffEqBase.NullParameters} ? p : Pair.(rs.ps,p)
     return DiscreteProblem(convert(JumpSystem,rs), u0,tspan,p, args...; kwargs...)
 end
 
@@ -515,8 +509,6 @@ end
 
 # SteadyStateProblem from AbstractReactionNetwork
 function DiffEqBase.SteadyStateProblem(rs::ReactionSystem, u0::Union{AbstractArray, Number}, p=DiffEqBase.NullParameters(), args...; kwargs...)
-    #u0 = typeof(u0) <: Array{<:Pair} ? u0 : Pair.(rs.states,u0)
-    #p = typeof(p) <: Union{Array{<:Pair},DiffEqBase.NullParameters} ? p : Pair.(rs.ps,p)
     return SteadyStateProblem(ODEFunction(convert(ODESystem,rs)),u0,p, args...; kwargs...)
 end
 

src/utils.jl

@@ -271,11 +271,11 @@ function lower_varname(t::Term, iv)
 end
 lower_varname(t::Sym, iv) = t
 
-function lower_mapnames(umap::AbstractArray{<:Pair}) where T
-    [value(k) => value(v) for (k, v) in umap]
+function lower_mapnames(umap::AbstractArray{T}) where {T<:Pair}
+    T[value(k) => value(v) for (k, v) in umap]
 end
-function lower_mapnames(umap::AbstractArray{<:Pair},name) where T
-    [lower_varname(value(k), name) => value(v) for (k, v) in umap]
+function lower_mapnames(umap::AbstractArray{T},name) where {T<:Pair}
+    T[lower_varname(value(k), name) => value(v) for (k, v) in umap]
 end
 lower_mapnames(umap::AbstractArray{<:Number}) = umap # Ambiguity
 lower_mapnames(umap::AbstractArray{<:Number},name) = umap

src/variables.jl

@@ -211,8 +211,8 @@ varmap_to_vars(varmap,varlist)
 Takes a list of pairs of variables=>values and an ordered list of variables and
 creates the array of values in the correct order
 """
-function varmap_to_vars(varmap::AbstractArray{<:Pair},varlist)
-    out = similar(varmap,typeof(last(first(varmap))))
+function varmap_to_vars(varmap::AbstractArray{Pair{T,S}},varlist) where {T,S}
+    out = similar(varmap,S)
     for (ivar, ival) in varmap
         j = findfirst(isequal(ivar),varlist)
         if isnothing(j)