feat: track parameter dependency defaults and guesses

Author: AayushSabharwal

src/systems/diffeqs/odesystem.jl

@@ -232,6 +232,8 @@ function ODESystem(deqs::AbstractVector{<:Equation}, iv, dvs, ps;
     ctrl′ = value.(controls)
     dvs′ = value.(dvs)
     dvs′ = filter(x -> !isdelay(x, iv), dvs′)
+    parameter_dependencies, ps′ = process_parameter_dependencies(
+        parameter_dependencies, ps′)
     if !(isempty(default_u0) && isempty(default_p))
         Base.depwarn(
             "`default_u0` and `default_p` are deprecated. Use `defaults` instead.",
@@ -241,6 +243,8 @@ function ODESystem(deqs::AbstractVector{<:Equation}, iv, dvs, ps;
     var_to_name = Dict()
     process_variables!(var_to_name, defaults, dvs′)
     process_variables!(var_to_name, defaults, ps′)
+    process_variables!(var_to_name, defaults, [eq.lhs for eq in parameter_dependencies])
+    process_variables!(var_to_name, defaults, [eq.rhs for eq in parameter_dependencies])
     defaults = Dict{Any, Any}(value(k) => value(v)
     for (k, v) in pairs(defaults) if v !== nothing)
 
@@ -252,9 +256,13 @@ function ODESystem(deqs::AbstractVector{<:Equation}, iv, dvs, ps;
     hasaguess = findall(!isnothing, syspsguesses)
     ps_guesses = ps′[hasaguess] .=> syspsguesses[hasaguess]
     syspsguesses = isempty(ps_guesses) ? Dict() : todict(ps_guesses)
-
-    guesses = merge(sysdvsguesses, syspsguesses, todict(guesses))
-    guesses = Dict{Any, Any}(value(k) => value(v) for (k, v) in pairs(guesses))
+    syspdepguesses = [ModelingToolkit.getguess(eq.lhs) for eq in parameter_dependencies]
+    hasaguess = findall(!isnothing, syspdepguesses)
+    pdep_guesses = [eq.lhs for eq in parameter_dependencies][hasaguess] .=> syspdepguesses[hasaguess]
+    syspdepguesses = isempty(pdep_guesses) ? Dict() : todict(pdep_guesses)
+    
+    guesses = merge(sysdvsguesses, syspsguesses, syspdepguesses, todict(guesses))
+    guesses = Dict{Any, Any}(value(k) => value(v) for (k, v) in pairs(guesses) if v !== nothing)
 
     isempty(observed) || collect_var_to_name!(var_to_name, (eq.lhs for eq in observed))
 
@@ -269,8 +277,6 @@ function ODESystem(deqs::AbstractVector{<:Equation}, iv, dvs, ps;
     end
     cont_callbacks = SymbolicContinuousCallbacks(continuous_events)
     disc_callbacks = SymbolicDiscreteCallbacks(discrete_events)
-    parameter_dependencies, ps′ = process_parameter_dependencies(
-        parameter_dependencies, ps′)
     ODESystem(Threads.atomic_add!(SYSTEM_COUNT, UInt(1)),
         deqs, iv′, dvs′, ps′, tspan, var_to_name, ctrl′, observed, tgrad, jac,
         ctrl_jac, Wfact, Wfact_t, name, systems, defaults, guesses, nothing, initializesystem,