@@ -244,11 +244,16 @@ function ODESystem(deqs::AbstractVector{<:Equation}, iv, dvs, ps;
244
244
process_variables! (var_to_name, defaults, dvs′)
245
245
process_variables! (var_to_name, defaults, ps′)
246
246
247
- sysguesses = [ModelingToolkit. getguess (st) for st in dvs′]
248
- hasaguess = findall (! isnothing, sysguesses)
249
- var_guesses = dvs′[hasaguess] .=> sysguesses[hasaguess]
250
- sysguesses = isempty (var_guesses) ? Dict () : todict (var_guesses)
251
- guesses = merge (sysguesses, todict (guesses))
247
+ sysdvsguesses = [ModelingToolkit. getguess (st) for st in dvs′]
248
+ hasaguess = findall (! isnothing, sysdvsguesses)
249
+ var_guesses = dvs′[hasaguess] .=> sysdvsguesses[hasaguess]
250
+ sysdvsguesses = isempty (var_guesses) ? Dict () : todict (var_guesses)
251
+ syspsguesses = [ModelingToolkit. getguess (st) for st in ps′]
252
+ hasaguess = findall (! isnothing, syspsguesses)
253
+ ps_guesses = ps′[hasaguess] .=> syspsguesses[hasaguess]
254
+ syspsguesses = isempty (ps_guesses) ? Dict () : todict (ps_guesses)
255
+
256
+ guesses = merge (sysdvsguesses, syspsguesses, todict (guesses))
252
257
guesses = Dict {Any, Any} (value (k) => value (v) for (k, v) in pairs (guesses))
253
258
254
259
isempty (observed) || collect_var_to_name! (var_to_name, (eq. lhs for eq in observed))
0 commit comments