Merge pull request #747 from SciML/myb/u0map

Handle u0 with UnionAll eltype

Author: ChrisRackauckas

src/systems/diffeqs/abstractodesystem.jl

@@ -266,7 +266,7 @@ function DiffEqBase.ODEProblem{iip}(sys::AbstractODESystem,u0map,tspan,
     ps = parameters(sys)
     u0map′ = lower_mapnames(u0map,sys.iv)
     u0 = varmap_to_vars(u0map′,dvs)
-    
+
     if !(parammap isa DiffEqBase.NullParameters)
         parammap′ = lower_mapnames(parammap)
         p = varmap_to_vars(parammap′,ps)

src/variables.jl

@@ -206,13 +206,13 @@ function TreeViews.treelabel(io::IO,x::Variable,
 end
 
 """
-varmap_to_vars(varmap,varlist)
+    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{T,S}},varlist) where {T,S}
-    out = similar(varmap,S)
+function varmap_to_vars(varmap::AbstractArray{<:Pair},varlist)
+    out = map(zero ∘ last, varmap)
     for (ivar, ival) in varmap
         j = findfirst(isequal(ivar),varlist)
         if isnothing(j)
@@ -228,7 +228,8 @@ function varmap_to_vars(varmap::AbstractArray{Pair{T,S}},varlist) where {T,S}
     ArrayInterface.restructure(varmap,out)
 end
 
-function varmap_to_vars(varmap::NTuple{N,Pair{T,S}},varlist) where {N,T,S}
+function varmap_to_vars(varmap::NTuple{N,<:Pair},varlist) where {N}
+    S = Base.promote_typeof(map(zero ∘ last, varmap)...)
     out = MArray{Tuple{N},S}(undef)
     for (ivar, ival) in varmap
         j = findfirst(isequal(ivar),varlist)

test/odesystem.jl

@@ -186,9 +186,10 @@ eqs = [D(y₁) ~ -k₁*y₁+k₃*y₂*y₃,
        0     ~  y₁ + y₂ + y₃ - 1,
        D(y₂) ~  k₁*y₁-k₂*y₂^2-k₃*y₂*y₃]
 sys = ODESystem(eqs)
-u0 = [y₁ => 1.0,
-      y₂ => 0.0,
-      y₃ => 0.0]
+u0 = Pair[]
+push!(u0, y₁ => 1.0)
+push!(u0, y₂ => 0.0)
+push!(u0, y₃ => 0.0)
 p  = [k₁ => 0.04,
       k₂ => 3e7,
       k₃ => 1e4]