fix defaults

Author: ValentinKaisermayer

src/structural_transformation/codegen.jl

@@ -495,6 +495,8 @@ function ODAEProblem{iip}(
     ps = parameters(sys)
     defs = defaults(sys)
 
+    defs = ModelingToolkit.mergedefaults(defs,parammap,ps)
+    defs = ModelingToolkit.mergedefaults(defs,u0map,dvs)
     u0 = ModelingToolkit.varmap_to_vars(u0map, dvs; defaults=defs)
     p = ModelingToolkit.varmap_to_vars(parammap, ps; defaults=defs)
 

src/systems/diffeqs/abstractodesystem.jl

@@ -557,22 +557,22 @@ function process_DEProblem(constructor, sys::AbstractODESystem,u0map,parammap;
     eqs = equations(sys)
     dvs = states(sys)
     ps = parameters(sys)
-    defs = defaults(sys)
     iv = get_iv(sys)
-
-    pdefs = mergedefaults(defs, parammap, ps)
-    u0defs = mergedefaults(defs, u0map, dvs)
-
-    u0 = varmap_to_vars(u0map, dvs; defaults=u0defs)
+    
+    defs = defaults(sys)
+    defs = mergedefaults(defs,parammap,ps)
+    defs = mergedefaults(defs,u0map,dvs)
+    
+    u0 = varmap_to_vars(u0map,dvs; defaults=defs)
+    p = varmap_to_vars(parammap,ps; defaults=defs)
     if implicit_dae && du0map !== nothing
         ddvs = map(Differential(iv), dvs)
-        du0defs = mergedefaults(defs, du0map, ddvs)
-        du0 = varmap_to_vars(du0map, ddvs; defaults=du0defs, toterm=identity)
+        defs = mergedefaults(defs,du0map, ddvs)
+        du0 = varmap_to_vars(du0map,ddvs; defaults=defs, toterm=identity)
     else
         du0 = nothing
         ddvs = nothing
     end
-    p = varmap_to_vars(parammap, ps; defaults=pdefs)
 
     check_eqs_u0(eqs, dvs, u0; kwargs...)
 

src/systems/discrete_system/discrete_system.jl

@@ -174,33 +174,17 @@ function DiffEqBase.DiscreteProblem(sys::DiscreteSystem,u0map,tspan,
     ps = parameters(sys)
     eqs = equations(sys)
     eqs = linearize_eqs(sys, eqs)
-    defs = defaults(sys)
     iv = get_iv(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=u0defs)
+    
+    defs = defaults(sys)
+    defs = mergedefaults(defs,parammap,ps)
+    defs = mergedefaults(defs,u0map,dvs)
+    
+    u0 = varmap_to_vars(u0map,dvs; defaults=defs)
+    p = varmap_to_vars(parammap,ps; defaults=defs)
 
     rhss = [eq.rhs for eq in eqs]
     u = dvs
-    p = varmap_to_vars(parammap,ps; defaults=pdefs)
 
     f_gen = generate_function(sys; expression=Val{eval_expression}, expression_module=eval_module)
     f_oop, _ = (@RuntimeGeneratedFunction(eval_module, ex) for ex in f_gen)

src/systems/jumps/jumpsystem.jl

@@ -220,9 +220,17 @@ dprob = DiscreteProblem(js, u₀map, tspan, parammap)
 """
 function DiffEqBase.DiscreteProblem(sys::JumpSystem, u0map, tspan::Union{Tuple,Nothing},
                                     parammap=DiffEqBase.NullParameters(); checkbounds=false, kwargs...)
+    
+    dvs = states(sys)
+    ps = parameters(sys)
+    
     defs = defaults(sys)
-    u0 = varmap_to_vars(u0map, states(sys); defaults=defs)
-    p  = varmap_to_vars(parammap, parameters(sys); defaults=defs)
+    # defs = mergedefaults(defs,parammap,ps)
+    # defs = mergedefaults(defs,u0map,dvs) # fill result in wrong type for u0
+    
+    u0 = varmap_to_vars(u0map,dvs; defaults=defs)
+    p = varmap_to_vars(parammap,ps; defaults=defs)
+        
     f  = DiffEqBase.DISCRETE_INPLACE_DEFAULT
 
     # just taken from abstractodesystem.jl for ODEFunction def

src/systems/nonlinear/nonlinearsystem.jl

@@ -264,7 +264,11 @@ function process_NonlinearProblem(constructor, sys::NonlinearSystem,u0map,paramm
     eqs = equations(sys)
     dvs = states(sys)
     ps = parameters(sys)
+    
     defs = defaults(sys)
+    defs = mergedefaults(defs,parammap,ps)
+    defs = mergedefaults(defs,u0map,dvs)
+    
     u0 = varmap_to_vars(u0map,dvs; defaults=defs)
     p = varmap_to_vars(parammap,ps; defaults=defs)
 

src/systems/optimization/optimizationsystem.jl

@@ -129,9 +129,9 @@ DiffEqBase.OptimizationProblem(sys::OptimizationSystem,args...;kwargs...) =
 
 """
 ```julia
-function DiffEqBase.OptimizationProblem{iip}(sys::OptimizationSystem,
+function DiffEqBase.OptimizationProblem{iip}(sys::OptimizationSystem,u0map,
                                           parammap=DiffEqBase.NullParameters();
-                                          u0=nothing, lb=nothing, ub=nothing,
+                                          lb=nothing, ub=nothing,
                                           grad = false,
                                           hess = false, sparse = false,
                                           checkbounds = false,
@@ -142,7 +142,7 @@ function DiffEqBase.OptimizationProblem{iip}(sys::OptimizationSystem,
 Generates an OptimizationProblem from an OptimizationSystem and allows for automatically
 symbolically calculating numerical enhancements.
 """
-function DiffEqBase.OptimizationProblem{iip}(sys::OptimizationSystem, u0,
+function DiffEqBase.OptimizationProblem{iip}(sys::OptimizationSystem, u0map,
                                           parammap=DiffEqBase.NullParameters();
                                           lb=nothing, ub=nothing,
                                           grad = false,
@@ -177,7 +177,10 @@ function DiffEqBase.OptimizationProblem{iip}(sys::OptimizationSystem, u0,
     _f = DiffEqBase.OptimizationFunction{iip,AutoModelingToolkit,typeof(f),typeof(_grad),typeof(_hess),Nothing,Nothing,Nothing,Nothing}(f,AutoModelingToolkit(),_grad,_hess,nothing,nothing,nothing,nothing)
 
     defs = defaults(sys)
-    u0 = varmap_to_vars(u0,dvs; defaults=defs)
+    defs = mergedefaults(defs,parammap,ps)
+    defs = mergedefaults(defs,u0map,dvs)
+
+    u0 = varmap_to_vars(u0map,dvs; defaults=defs)
     p = varmap_to_vars(parammap,ps; defaults=defs)
     lb = varmap_to_vars(lb,dvs; check=false)
     ub = varmap_to_vars(ub,dvs; check=false)
@@ -233,7 +236,10 @@ function OptimizationProblemExpr{iip}(sys::OptimizationSystem, u0,
     end
 
     defs = defaults(sys)
-    u0 = varmap_to_vars(u0,dvs; defaults=defs)
+    defs = mergedefaults(defs,parammap,ps)
+    defs = mergedefaults(defs,u0map,dvs)
+
+    u0 = varmap_to_vars(u0map,dvs; defaults=defs)
     p = varmap_to_vars(parammap,ps; defaults=defs)
     lb = varmap_to_vars(lb,dvs)
     ub = varmap_to_vars(ub,dvs)