Skip to content

Extend description and name in the same way #3179

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 1 commit into from
Nov 4, 2024
Merged

Extend description and name in the same way #3179

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions src/systems/abstractsystem.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2995,13 +2995,14 @@ end
"""
$(TYPEDSIGNATURES)

Extend the `basesys` with `sys`, the resulting system would inherit `sys`'s name
by default.
Extend `basesys` with `sys`.
By default, the resulting system inherits `sys`'s name and description.

See also [`compose`](@ref).
"""
function extend(sys::AbstractSystem, basesys::AbstractSystem; name::Symbol = nameof(sys),
gui_metadata = get_gui_metadata(sys))
function extend(sys::AbstractSystem, basesys::AbstractSystem;
name::Symbol = nameof(sys), description = description(sys),
gui_metadata = get_gui_metadata(sys))
T = SciMLBase.parameterless_type(basesys)
ivs = independent_variables(basesys)
if !(sys isa T)
Expand All @@ -3023,13 +3024,12 @@ function extend(sys::AbstractSystem, basesys::AbstractSystem; name::Symbol = nam
cevs = union(get_continuous_events(basesys), get_continuous_events(sys))
devs = union(get_discrete_events(basesys), get_discrete_events(sys))
defs = merge(get_defaults(basesys), get_defaults(sys)) # prefer `sys`
desc = join(filter(desc -> !isempty(desc), description.([sys, basesys])), " ") # concatenate non-empty descriptions with space
meta = union_nothing(get_metadata(basesys), get_metadata(sys))
syss = union(get_systems(basesys), get_systems(sys))
args = length(ivs) == 0 ? (eqs, sts, ps) : (eqs, ivs[1], sts, ps)
kwargs = (parameter_dependencies = dep_ps, observed = obs, continuous_events = cevs,
discrete_events = devs, defaults = defs, systems = syss, metadata = meta,
name = name, description = desc, gui_metadata = gui_metadata)
name = name, description = description, gui_metadata = gui_metadata)

# collect fields specific to some system types
if basesys isa ODESystem
Expand All @@ -3041,8 +3041,8 @@ function extend(sys::AbstractSystem, basesys::AbstractSystem; name::Symbol = nam
return T(args...; kwargs...)
end

function Base.:(&)(sys::AbstractSystem, basesys::AbstractSystem; name::Symbol = nameof(sys))
extend(sys, basesys; name = name)
function Base.:(&)(sys::AbstractSystem, basesys::AbstractSystem; kwargs...)
extend(sys, basesys; kwargs...)
end

"""
Expand Down
Loading