Merge pull request #1017 from pepijndevos/syminit

support symbolic parameters at problem level

Author: ChrisRackauckas

src/systems/diffeqs/abstractodesystem.jl

@@ -397,16 +397,34 @@ function process_DEProblem(constructor, sys::AbstractODESystem,u0map,parammap;
     ps = parameters(sys)
     defs = defaults(sys)
     iv = independent_variable(sys)
+    if parammap isa Dict
+        u0defs = merge(parammap, defs)
+    elseif eltype(parammap) <: Pair
+        u0defs = merge(Dict(parammap), defs)
+    elseif eltype(parammap) <: Number
+        u0defs = merge(Dict(zip(ps, parammap)), defs)
+    else
+        u0defs = defs
+    end
+    if u0map isa Dict
+        pdefs = merge(u0map, defs)
+    elseif eltype(u0map) <: Pair
+        pdefs = merge(Dict(u0map), defs)
+    elseif eltype(u0map) <: Number
+        pdefs = merge(Dict(zip(dvs, u0map)), defs)
+    else
+        pdefs = defs
+    end
 
-    u0 = varmap_to_vars(u0map,dvs; defaults=defs)
+    u0 = varmap_to_vars(u0map,dvs; defaults=u0defs)
     if implicit_dae && du0map !== nothing
         ddvs = map(Differential(iv), dvs)
         du0 = varmap_to_vars(du0map, ddvs; defaults=defaults, toterm=identity)
     else
         du0 = nothing
         ddvs = nothing
     end
-    p = varmap_to_vars(parammap,ps; defaults=defs)
+    p = varmap_to_vars(parammap,ps; defaults=pdefs)
 
     check_eqs_u0(eqs, dvs, u0)
 

test/symbolic_parameters.jl

@@ -45,3 +45,24 @@ prob = NonlinearProblem(top, [states(ns, u)=>1.0, a=>1.0], Pair[])
 prob = NonlinearProblem(top, [states(ns, u)=>1.0, a=>1.0])
 @test prob.u0 == [1.0, 0.5, 1.1, 0.9]
 @show sol = solve(prob,NewtonRaphson())
+
+# test initial conditions and parameters at the problem level
+pars = @parameters(begin
+                   x0
+                   t
+                   end)
+vars = @variables(begin
+                  x(t)
+                  end)
+der = Differential(t)
+eqs = [der(x) ~ x]
+sys = ODESystem(eqs, t, vars, [x0])
+pars = [
+  x0 => 10.0,
+]
+initialValues = [
+  x => x0
+]
+tspan = (0.0, 1.0)
+problem = ODEProblem(sys, initialValues, tspan, pars)
+@test problem.u0 isa Vector{Float64}