More default metadata

Author: YingboMa

src/systems/control/controlsystem.jl

@@ -101,6 +101,8 @@ function ControlSystem(loss, deqs::AbstractVector{<:Equation}, iv, dvs, controls
     ps′ = value.(ps)
     defaults = todict(defaults)
     defaults = Dict(value(k) => value(v) for (k, v) in pairs(defaults))
+    collect_defaults!(defaults, dvs′)
+    collect_defaults!(defaults, ps′)
     ControlSystem(value(loss), deqs, iv′, dvs′, controls′,
                   ps′, observed, name, systems, defaults)
 end

src/systems/diffeqs/sdesystem.jl

@@ -117,6 +117,9 @@ function SDESystem(deqs::AbstractVector{<:Equation}, neqs, iv, dvs, ps;
     defaults = todict(defaults)
     defaults = Dict(value(k) => value(v) for (k, v) in pairs(defaults))
 
+    collect_defaults!(defaults, dvs′)
+    collect_defaults!(defaults, ps′)
+
     tgrad = RefValue(Vector{Num}(undef, 0))
     jac = RefValue{Any}(Matrix{Num}(undef, 0, 0))
     ctrl_jac = RefValue{Any}(Matrix{Num}(undef, 0, 0))

src/systems/jumps/jumpsystem.jl

@@ -67,7 +67,7 @@ function JumpSystem(eqs, iv, states, ps;
                     name = gensym(:JumpSystem),
                     connection_type=nothing,
                     kwargs...)
-                    
+
     sysnames = nameof.(systems)
     if length(unique(sysnames)) != length(sysnames)
         throw(ArgumentError("System names must be unique."))
@@ -90,7 +90,11 @@ function JumpSystem(eqs, iv, states, ps;
     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, connection_type)
+    states, ps = value.(states), value.(ps)
+    collect_defaults!(defaults, states)
+    collect_defaults!(defaults, ps)
+
+    JumpSystem{typeof(ap)}(ap, value(iv), states, ps, observed, name, systems, defaults, connection_type)
 end
 
 function generate_rate_function(js, rate)

src/systems/nonlinear/nonlinearsystem.jl

@@ -73,7 +73,12 @@ function NonlinearSystem(eqs, states, ps;
     jac = RefValue{Any}(Matrix{Num}(undef, 0, 0))
     defaults = todict(defaults)
     defaults = Dict(value(k) => value(v) for (k, v) in pairs(defaults))
-    NonlinearSystem(eqs, value.(states), value.(ps), observed, jac, name, systems, defaults, nothing, connection_type)
+
+    states, ps = value.(states), value.(ps)
+    collect_defaults!(defaults, states)
+    collect_defaults!(defaults, ps)
+
+    NonlinearSystem(eqs, states, ps, observed, jac, name, systems, defaults, nothing, connection_type)
 end
 
 function calculate_jacobian(sys::NonlinearSystem; sparse=false, simplify=false)

src/systems/optimization/optimizationsystem.jl

@@ -27,7 +27,7 @@ struct OptimizationSystem <: AbstractSystem
     equality_constraints::Vector{Equation}
     inequality_constraints::Vector
     """
-    Name: the name of the system.  These are required to have unique names. 
+    Name: the name of the system.  These are required to have unique names.
     """
     name::Symbol
     """
@@ -60,8 +60,12 @@ function OptimizationSystem(op, states, ps;
     defaults = todict(defaults)
     defaults = Dict(value(k) => value(v) for (k, v) in pairs(defaults))
 
+    states, ps = value.(states), value.(ps)
+    collect_defaults!(defaults, states)
+    collect_defaults!(defaults, ps)
+
     OptimizationSystem(
-                       value(op), value.(states), value.(ps),
+                       value(op), states, ps,
                        observed,
                        equality_constraints, inequality_constraints,
                        name, systems, defaults