Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Throw helpful error when unknowns in the initialization system don't have guesses #2874

Closed
wants to merge 11 commits into from
Closed

Throw helpful error when unknowns in the initialization system don't have guesses #2874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d8dec36
Minor cleanup to simplify error implementation
hersle Jul 18, 2024
53e2aad
Check that all unknowns have a guess
hersle Jul 18, 2024
ff443e4
Test a system that really should have a guess
hersle Jul 18, 2024
c4463b3
Format
hersle Jul 18, 2024
c193782
Update src/systems/diffeqs/abstractodesystem.jl
ChrisRackauckas Jul 18, 2024
48a2452
Format
hersle Jul 18, 2024
7268d6f
Merge branch 'master' into error_missing_guesses
hersle Jul 18, 2024
6f1cffb
Fix name clash for defaults
hersle Jul 18, 2024
536aff6
Show all unknowns missing guesses; not only the first
hersle Jul 18, 2024
4d62d11
Also include u0map in known unknowns; merge keys in a way that actual…
hersle Jul 19, 2024
699a98d
Format
hersle Jul 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/systems/diffeqs/abstractodesystem.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1562,14 +1562,17 @@ function InitializationProblem{iip, specialize}(sys::AbstractODESystem,
parammap = parammap isa DiffEqBase.NullParameters || isempty(parammap) ?
[get_iv(sys) => t] :
merge(todict(parammap), Dict(get_iv(sys) => t))
if isempty(u0map)
u0map = Dict()
end
if isempty(guesses)
guesses = Dict()
end
u0map = isempty(u0map) ? Dict() : todict(u0map)
guesses = isempty(guesses) ? Dict() : todict(guesses)
defs = defaults(isys)

# Check that all unknowns have guesses
unknowns_given = union(keys(guesses), keys(defs), keys(u0map))
unknowns_missing = setdiff(unknowns(isys), unknowns_given)
!isempty(unknowns_missing) &&
throw(ArgumentError("Missing guesses for unknowns $(join(unknowns_missing, ", "))."))

u0map = merge(todict(guesses), todict(u0map))
u0map = merge(guesses, u0map)
if neqs == nunknown
NonlinearProblem(isys, u0map, parammap; kwargs...)
else
Expand Down
8 changes: 8 additions & 0 deletions test/initializationsystem.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,3 +456,11 @@ sys = structural_simplify(unsimp; fully_determined = false)
sys = extend(sysx, sysy)
@test length(equations(generate_initializesystem(sys))) == 2
@test length(ModelingToolkit.guesses(sys)) == 1

# https://github.com/SciML/ModelingToolkit.jl/issues/2873
@testset "Error on missing defaults" begin
@variables x(t) y(t)
@named sys = ODESystem([x^2 + y^2 ~ 25, D(x) ~ 1], t)
ssys = structural_simplify(sys)
@test_throws ArgumentError ODEProblem(ssys, [x => 3], (0, 1), []) # y should have a guess
end
Loading