Merge pull request #1490 from ValentinKaisermayer/patch-concrete_init

Patch concrete init

Author: ChrisRackauckas

src/systems/diffeqs/abstractodesystem.jl

@@ -563,12 +563,12 @@ function process_DEProblem(constructor, sys::AbstractODESystem,u0map,parammap;
     defs = mergedefaults(defs,parammap,ps)
     defs = mergedefaults(defs,u0map,dvs)
 
-    u0 = varmap_to_vars(u0map,dvs; defaults=defs)
+    u0 = varmap_to_vars(u0map,dvs; defaults=defs, promotetoconcrete=true)
     p = varmap_to_vars(parammap,ps; defaults=defs)
     if implicit_dae && du0map !== nothing
         ddvs = map(Differential(iv), dvs)
         defs = mergedefaults(defs,du0map, ddvs)
-        du0 = varmap_to_vars(du0map,ddvs; defaults=defs, toterm=identity)
+        du0 = varmap_to_vars(du0map,ddvs; defaults=defs, toterm=identity, promotetoconcrete=true)
     else
         du0 = nothing
         ddvs = nothing

src/systems/discrete_system/discrete_system.jl

@@ -180,7 +180,7 @@ function DiffEqBase.DiscreteProblem(sys::DiscreteSystem,u0map,tspan,
     defs = mergedefaults(defs,parammap,ps)
     defs = mergedefaults(defs,u0map,dvs)
 
-    u0 = varmap_to_vars(u0map,dvs; defaults=defs)
+    u0 = varmap_to_vars(u0map,dvs; defaults=defs, promotetoconcrete=true)
     p = varmap_to_vars(parammap,ps; defaults=defs)
 
     rhss = [eq.rhs for eq in eqs]

src/systems/jumps/jumpsystem.jl

@@ -228,7 +228,7 @@ function DiffEqBase.DiscreteProblem(sys::JumpSystem, u0map, tspan::Union{Tuple,N
     defs = mergedefaults(defs,parammap,ps)
     defs = mergedefaults(defs,u0map,dvs) 
 
-    u0 = varmap_to_vars(u0map,dvs; defaults=defs)
+    u0 = varmap_to_vars(u0map,dvs; defaults=defs, promotetoconcrete=true)
     p = varmap_to_vars(parammap,ps; defaults=defs)
 
     f  = DiffEqBase.DISCRETE_INPLACE_DEFAULT

src/systems/nonlinear/nonlinearsystem.jl

@@ -269,7 +269,7 @@ function process_NonlinearProblem(constructor, sys::NonlinearSystem,u0map,paramm
     defs = mergedefaults(defs,parammap,ps)
     defs = mergedefaults(defs,u0map,dvs)
 
-    u0 = varmap_to_vars(u0map,dvs; defaults=defs)
+    u0 = varmap_to_vars(u0map,dvs; defaults=defs, promotetoconcrete=true)
     p = varmap_to_vars(parammap,ps; defaults=defs)
 
     check_eqs_u0(eqs, dvs, u0; kwargs...)

src/systems/optimization/optimizationsystem.jl

@@ -239,7 +239,7 @@ function OptimizationProblemExpr{iip}(sys::OptimizationSystem, u0,
     defs = mergedefaults(defs,parammap,ps)
     defs = mergedefaults(defs,u0map,dvs)
 
-    u0 = varmap_to_vars(u0map,dvs; defaults=defs)
+    u0 = varmap_to_vars(u0map,dvs; defaults=defs, promotetoconcrete=true)
     p = varmap_to_vars(parammap,ps; defaults=defs)
     lb = varmap_to_vars(lb,dvs)
     ub = varmap_to_vars(ub,dvs)

src/utils.jl

@@ -470,4 +470,17 @@ function mergedefaults(defaults, varmap, vars)
     else
         defaults
     end
+end
+
+function promote_to_concrete(vs)
+    if isempty(vs) 
+        return vs
+    end
+    T = eltype(vs)
+    if Base.isconcretetype(T) # nothing to do
+        vs
+    else
+        C = foldl((t, elem)->promote_type(t, eltype(elem)), vs; init=typeof(first(vs)))
+        convert.(C, vs)
+    end
 end

src/variables.jl

@@ -32,7 +32,7 @@ Takes a list of pairs of `variables=>values` and an ordered list of variables
 and creates the array of values in the correct order with default values when
 applicable.
 """
-function varmap_to_vars(varmap, varlist; defaults=Dict(), check=true, toterm=Symbolics.diff2term)
+function varmap_to_vars(varmap, varlist; defaults=Dict(), check=true, toterm=Symbolics.diff2term, promotetoconcrete=false)
     varlist = map(unwrap, varlist)
     # Edge cases where one of the arguments is effectively empty.
     is_incomplete_initialization = varmap isa DiffEqBase.NullParameters || varmap === nothing
@@ -51,11 +51,15 @@ function varmap_to_vars(varmap, varlist; defaults=Dict(), check=true, toterm=Sym
     # We respect the input type
     container_type = T <: Dict ? Array : T
 
-    if eltype(varmap) <: Pair # `varmap` is a dict or an array of pairs
+    vals = if eltype(varmap) <: Pair # `varmap` is a dict or an array of pairs
         varmap = todict(varmap)
-        vals = _varmap_to_vars(varmap, varlist; defaults=defaults, check=check, toterm=toterm)
+        _varmap_to_vars(varmap, varlist; defaults=defaults, check=check, toterm=toterm)
     else # plain array-like initialization
-        vals = varmap
+        varmap
+    end
+
+    if promotetoconcrete
+        vals = promote_to_concrete(vals)
     end
 
     if isempty(vals)

test/odesystem.jl

@@ -631,10 +631,14 @@ let
     @test isapprox(sol[x[1]][end], 2, atol=1e-3)
 
     # no initial conditions for D(x[1]) and D(x[2]) provided
-    @test_throws ArgumentError prob = DAEProblem(sys, Pair[], Pair[], (0, 50))    
+    @test_throws ArgumentError prob = DAEProblem(sys, Pair[], Pair[], (0, 50))   
+    
+    prob = ODEProblem(sys, Pair[x[1] => 0], (0, 50))
+    sol = solve(prob, Rosenbrock23())
+    @test isapprox(sol[x[1]][end], 1, atol=1e-3)
 end
 
-#issue 1475 (mixed numeric type)
+#issue 1475 (mixed numeric type for parameters)
 let
     @parameters k1 k2
     @variables t, A(t)