Skip to content

Trivial optimization in generate_initializesystem #3779

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

Merged
merged 4 commits into from
Jul 2, 2025
Merged

Trivial optimization in generate_initializesystem #3779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8bb4eb6
Call default_toterm on each default only once
hersle Jun 27, 2025
c2bd333
Don't refer to non-existent AbstractTimeDependentSystem
hersle Jun 27, 2025
2597d6a
Remove unused variables
hersle Jun 27, 2025
26255ab
Convert each equation to string only once
hersle Jun 28, 2025
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: 8 additions & 9 deletions src/systems/nonlinear/initializesystem.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ end
"""
$(TYPEDSIGNATURES)

Generate `System` of nonlinear equations which initializes a problem from specified initial conditions of an `AbstractTimeDependentSystem`.
Generate `System` of nonlinear equations which initializes a problem from specified initial conditions of a time-dependent `AbstractSystem`.
"""
function generate_initializesystem_timevarying(sys::AbstractSystem;
op = Dict(),
Expand Down Expand Up @@ -71,7 +71,6 @@ function generate_initializesystem_timevarying(sys::AbstractSystem;
eqs_ics = Equation[]
defs = copy(defaults(sys)) # copy so we don't modify sys.defaults
additional_guesses = anydict(guesses)
additional_initialization_eqs = Vector{Equation}(initialization_eqs)
guesses = merge(get_guesses(sys), additional_guesses)
idxs_diff = isdiffeq.(eqs)

Expand Down Expand Up @@ -190,11 +189,13 @@ function generate_initializesystem_timevarying(sys::AbstractSystem;
push!(pars, get_iv(sys))

# 8) use observed equations for guesses of observed variables if not provided
guessed = Set(keys(defs)) # x(t), D(x(t)), ...
guessed = union(guessed, Set(default_toterm.(guessed))) # x(t), D(x(t)), xˍt(t), ...
for eq in trueobs
haskey(defs, eq.lhs) && continue
any(x -> isequal(default_toterm(x), eq.lhs), keys(defs)) && continue

defs[eq.lhs] = eq.rhs
if !(eq.lhs in guessed)
defs[eq.lhs] = eq.rhs
#push!(guessed, eq.lhs) # should not encounter eq.lhs twice, so don't need to track it
end
end
append!(eqs_ics, trueobs)

Expand All @@ -216,7 +217,7 @@ end
"""
$(TYPEDSIGNATURES)

Generate `System` of nonlinear equations which initializes a problem from specified initial conditions of an `AbstractTimeDependentSystem`.
Generate `System` of nonlinear equations which initializes a problem from specified initial conditions of a time-independent `AbstractSystem`.
"""
function generate_initializesystem_timeindependent(sys::AbstractSystem;
op = Dict(),
Expand All @@ -228,12 +229,10 @@ function generate_initializesystem_timeindependent(sys::AbstractSystem;
eqs = equations(sys)
trueobs, eqs = unhack_observed(observed(sys), eqs)
vars = unique([unknowns(sys); getfield.(trueobs, :lhs)])
vars_set = Set(vars) # for efficient in-lookup

eqs_ics = Equation[]
defs = copy(defaults(sys)) # copy so we don't modify sys.defaults
additional_guesses = anydict(guesses)
additional_initialization_eqs = Vector{Equation}(initialization_eqs)
guesses = merge(get_guesses(sys), additional_guesses)

# PREPROCESSING
Expand Down
2 changes: 1 addition & 1 deletion src/systems/systemstructure.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ function TearingState(sys; quick_cancel = false, check = true, sort_eqs = true)
if sort_eqs
# sort equations lexicographically to reduce simplification issues
# depending on order due to NP-completeness of tearing.
sortidxs = Base.sortperm(eqs, by = string)
sortidxs = Base.sortperm(string.(eqs)) # "by = string" creates more strings
eqs = eqs[sortidxs]
original_eqs = original_eqs[sortidxs]
symbolic_incidence = symbolic_incidence[sortidxs]
Expand Down
Loading