Add todict and _merge

Author: YingboMa

src/systems/control/controlsystem.jl

@@ -79,7 +79,7 @@ function ControlSystem(loss, deqs::AbstractVector{<:Equation}, iv, dvs, controls
                        systems = ODESystem[],
                        default_u0=Dict(),
                        default_p=Dict(),
-                       defaults=merge(Dict(default_u0), Dict(default_p)),
+                       defaults=_merge(Dict(default_u0), Dict(default_p)),
                        name=gensym(:ControlSystem))
     if !(isempty(default_u0) && isempty(default_p))
         Base.depwarn("`default_u0` and `default_p` are deprecated. Use `defaults` instead.", :ControlSystem, force=true)
@@ -88,7 +88,8 @@ function ControlSystem(loss, deqs::AbstractVector{<:Equation}, iv, dvs, controls
     dvs′ = value.(dvs)
     controls′ = value.(controls)
     ps′ = value.(ps)
-    defaults isa Dict || (defaults = Dict(defaults))
+    defaults = todict(defaults)
+    defaults = Dict(value(k) => value(v) for (k, v) in pairs(defaults))
     ControlSystem(value(loss), deqs, iv′, dvs′, controls′,
                   ps′, observed, name, systems, defaults)
 end

src/systems/diffeqs/odesystem.jl

@@ -79,7 +79,7 @@ function ODESystem(
                    name=gensym(:ODESystem),
                    default_u0=Dict(),
                    default_p=Dict(),
-                   defaults=merge(Dict(default_u0), Dict(default_p)),
+                   defaults=_merge(Dict(default_u0), Dict(default_p)),
                   )
     iv′ = value(iv)
     dvs′ = value.(dvs)
@@ -88,7 +88,7 @@ function ODESystem(
     if !(isempty(default_u0) && isempty(default_p))
         Base.depwarn("`default_u0` and `default_p` are deprecated. Use `defaults` instead.", :ODESystem, force=true)
     end
-    defaults isa Dict || (defaults = Dict(defaults))
+    defaults = todict(defaults)
     defaults = Dict(value(k) => value(v) for (k, v) in pairs(defaults))
 
     tgrad = RefValue(Vector{Num}(undef, 0))

src/systems/diffeqs/sdesystem.jl

@@ -78,7 +78,7 @@ function SDESystem(deqs::AbstractVector{<:Equation}, neqs, iv, dvs, ps;
                    systems = SDESystem[],
                    default_u0=Dict(),
                    default_p=Dict(),
-                   defaults=merge(Dict(default_u0), Dict(default_p)),
+                   defaults=_merge(Dict(default_u0), Dict(default_p)),
                    name = gensym(:SDESystem))
     iv′ = value(iv)
     dvs′ = value.(dvs)
@@ -87,7 +87,7 @@ function SDESystem(deqs::AbstractVector{<:Equation}, neqs, iv, dvs, ps;
     if !(isempty(default_u0) && isempty(default_p))
         Base.depwarn("`default_u0` and `default_p` are deprecated. Use `defaults` instead.", :SDESystem, force=true)
     end
-    defaults isa Dict || (defaults = Dict(defaults))
+    defaults = todict(defaults)
     defaults = Dict(value(k) => value(v) for (k, v) in pairs(defaults))
 
     tgrad = RefValue(Vector{Num}(undef, 0))

src/systems/jumps/jumpsystem.jl

@@ -54,7 +54,7 @@ function JumpSystem(eqs, iv, states, ps;
                     systems = JumpSystem[],
                     default_u0=Dict(),
                     default_p=Dict(),
-                    defaults=merge(Dict(default_u0), Dict(default_p)),
+                    defaults=_merge(Dict(default_u0), Dict(default_p)),
                     name = gensym(:JumpSystem))
 
     ap = ArrayPartition(MassActionJump[], ConstantRateJump[], VariableRateJump[])
@@ -72,7 +72,7 @@ function JumpSystem(eqs, iv, states, ps;
     if !(isempty(default_u0) && isempty(default_p))
         Base.depwarn("`default_u0` and `default_p` are deprecated. Use `defaults` instead.", :JumpSystem, force=true)
     end
-    defaults isa Dict || (defaults = Dict(defaults))
+    defaults = todict(defaults)
     defaults = Dict(value(k) => value(v) for (k, v) in pairs(defaults))
 
     JumpSystem{typeof(ap)}(ap, value(iv), value.(states), value.(ps), observed, name, systems, defaults)

src/systems/nonlinear/nonlinearsystem.jl

@@ -51,12 +51,12 @@ function NonlinearSystem(eqs, states, ps;
                          name = gensym(:NonlinearSystem),
                          default_u0=Dict(),
                          default_p=Dict(),
-                         defaults=merge(Dict(default_u0), Dict(default_p)),
+                         defaults=_merge(Dict(default_u0), Dict(default_p)),
                          systems = NonlinearSystem[])
     if !(isempty(default_u0) && isempty(default_p))
         Base.depwarn("`default_u0` and `default_p` are deprecated. Use `defaults` instead.", :NonlinearSystem, force=true)
     end
-    defaults isa Dict || (defaults = Dict(defaults))
+    defaults = todict(defaults)
     defaults = Dict(value(k) => value(v) for (k, v) in pairs(defaults))
     NonlinearSystem(eqs, value.(states), value.(ps), observed, name, systems, defaults, nothing, [])
 end

src/systems/optimization/optimizationsystem.jl

@@ -47,13 +47,13 @@ function OptimizationSystem(op, states, ps;
                             inequality_constraints = [],
                             default_u0=Dict(),
                             default_p=Dict(),
-                            defaults=merge(Dict(default_u0), Dict(default_p)),
+                            defaults=_merge(Dict(default_u0), Dict(default_p)),
                             name = gensym(:OptimizationSystem),
                             systems = OptimizationSystem[])
     if !(isempty(default_u0) && isempty(default_p))
         Base.depwarn("`default_u0` and `default_p` are deprecated. Use `defaults` instead.", :OptimizationSystem, force=true)
     end
-    defaults isa Dict || (defaults = Dict(defaults))
+    defaults = todict(defaults)
     defaults = Dict(value(k) => value(v) for (k, v) in pairs(defaults))
 
     OptimizationSystem(

src/utils.jl

@@ -88,3 +88,10 @@ Maps the variable to a state.
 """
 tovar(s::Sym{<:Parameter}) = Sym{symtype(s)}(s.name)
 tovar(s::Sym) = s
+
+function todict(d)
+    eltype(d) <: Pair || throw(ArgumentError("The variable-value mapping must be a Dict."))
+    d isa Dict ? d : Dict(d)
+end
+
+_merge(d1, d2) = merge(todict(d1), todict(d2))