fix: fix inconsistent defaults with default_toterm variables

Author: AayushSabharwal

src/systems/diffeqs/odesystem.jl

@@ -238,6 +238,9 @@ function ODESystem(deqs::AbstractVector{<:Equation}, iv, dvs, ps;
     end
     defaults = todict(defaults)
     defaults = Dict{Any, Any}(value(k) => value(v) for (k, v) in pairs(defaults))
+    for k in collect(keys(defaults))
+        defaults[default_toterm(k)] = defaults[k]
+    end
     var_to_name = Dict()
     process_variables!(var_to_name, defaults, dvs′)
     process_variables!(var_to_name, defaults, ps′)
@@ -410,7 +413,7 @@ function build_explicit_observed_function(sys, ts;
         Set(arguments(st)[1] for st in sts if iscall(st) && operation(st) === getindex))
 
     observed_idx = Dict(x.lhs => i for (i, x) in enumerate(obs))
-    param_set = Set(full_parameters(sys))
+    param_set = Set(ps)
     param_set = union(param_set,
         Set(arguments(p)[1] for p in param_set if iscall(p) && operation(p) === getindex))
     param_set_ns = Set(unknowns(sys, p) for p in full_parameters(sys))

src/systems/diffeqs/sdesystem.jl

@@ -187,6 +187,9 @@ function SDESystem(deqs::AbstractVector{<:Equation}, neqs::AbstractArray, iv, dv
     end
     defaults = todict(defaults)
     defaults = Dict(value(k) => value(v) for (k, v) in pairs(defaults))
+    for k in collect(keys(defaults))
+        defaults[default_toterm(k)] = defaults[k]
+    end
 
     var_to_name = Dict()
     process_variables!(var_to_name, defaults, dvs′)

src/systems/discrete_system/discrete_system.jl

@@ -149,6 +149,9 @@ function DiscreteSystem(eqs::AbstractVector{<:Equation}, iv, dvs, ps;
     end
     defaults = todict(defaults)
     defaults = Dict(value(k) => value(v) for (k, v) in pairs(defaults))
+    for k in collect(keys(defaults))
+        defaults[default_toterm(k)] = defaults[k]
+    end
 
     var_to_name = Dict()
     process_variables!(var_to_name, defaults, dvs′)

src/systems/jumps/jumpsystem.jl

@@ -175,6 +175,9 @@ function JumpSystem(eqs, iv, unknowns, ps;
     end
     defaults = todict(defaults)
     defaults = Dict(value(k) => value(v) for (k, v) in pairs(defaults))
+    for k in collect(keys(defaults))
+        defaults[default_toterm(k)] = defaults[k]
+    end
 
     unknowns, ps = value.(unknowns), value.(ps)
     var_to_name = Dict()

src/systems/nonlinear/nonlinearsystem.jl

@@ -147,6 +147,9 @@ function NonlinearSystem(eqs, unknowns, ps;
     jac = RefValue{Any}(EMPTY_JAC)
     defaults = todict(defaults)
     defaults = Dict{Any, Any}(value(k) => value(v) for (k, v) in pairs(defaults))
+    for k in collect(keys(defaults))
+        defaults[default_toterm(k)] = defaults[k]
+    end
 
     unknowns, ps = value.(unknowns), value.(ps)
     var_to_name = Dict()

src/systems/optimization/constraints_system.jl

@@ -134,6 +134,9 @@ function ConstraintsSystem(constraints, unknowns, ps;
     jac = RefValue{Any}(EMPTY_JAC)
     defaults = todict(defaults)
     defaults = Dict(value(k) => value(v) for (k, v) in pairs(defaults))
+    for k in collect(keys(defaults))
+        defaults[default_toterm(k)] = defaults[k]
+    end
 
     var_to_name = Dict()
     process_variables!(var_to_name, defaults, unknowns′)

src/systems/optimization/optimizationsystem.jl

@@ -112,6 +112,9 @@ function OptimizationSystem(op, unknowns, ps;
     end
     defaults = todict(defaults)
     defaults = Dict(value(k) => value(v) for (k, v) in pairs(defaults))
+    for k in collect(keys(defaults))
+        defaults[default_toterm(k)] = defaults[k]
+    end
 
     var_to_name = Dict()
     process_variables!(var_to_name, defaults, unknowns′)