Merge pull request #713 from SciML/tuple

allow tuples in varmaps

Author: ChrisRackauckas

src/variables.jl

@@ -227,6 +227,22 @@ function varmap_to_vars(varmap::AbstractArray{Pair{T,S}},varlist) where {T,S}
     # Does things like MArray->SArray
     ArrayInterface.restructure(varmap,out)
 end
+
+function varmap_to_vars(varmap::NTuple{N,Pair{T,S}},varlist) where {N,T,S}
+    out = MArray{Tuple{N},S}(undef)
+    for (ivar, ival) in varmap
+        j = findfirst(isequal(ivar),varlist)
+        if isnothing(j)
+            throw(ArgumentError("Value $(ivar) provided in map not found in $(varlist)"))
+        elseif j > length(varmap)
+            throw(ArgumentError("Missing value in $(varmap), need $(varlist)"))
+        end
+        out[j] = ival
+    end
+    out.data
+end
+
 varmap_to_vars(varmap::AbstractArray,varlist) = varmap
+varmap_to_vars(varmap::Tuple,varlist) = varmap
 varmap_to_vars(varmap::DiffEqBase.NullParameters,varlist) = varmap
 varmap_to_vars(varmap::Nothing,varlist) = varmap

test/odesystem.jl

@@ -192,8 +192,14 @@ u0 = [y₁ => 1.0,
 p  = [k₁ => 0.04,
       k₂ => 3e7,
       k₃ => 1e4]
+p2 = (k₁ => 0.04,
+      k₂ => 3e7,
+      k₃ => 1e4)
 tspan = (0.0,100000.0)
 prob1 = ODEProblem(sys,u0,tspan,p)
+prob12 = ODEProblem(sys,u0,tspan,[0.04,3e7,1e4])
+prob13 = ODEProblem(sys,u0,tspan,(0.04,3e7,1e4))
+prob14 = ODEProblem(sys,u0,tspan,p2)
 prob2 = ODEProblem(sys,u0,tspan,p,jac=true)
 prob3 = ODEProblem(sys,u0,tspan,p,jac=true,sparse=true)
 for (prob, atol) in [(prob1, 1e-12), (prob2, 1e-12), (prob3, 1e-12)]