Skip to content

Commit

Permalink
Always check if AbstractSystems have a description
Browse files Browse the repository at this point in the history
  • Loading branch information
hersle committed Oct 20, 2024
1 parent f7e956f commit f575351
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
9 changes: 5 additions & 4 deletions src/systems/abstractsystem.jl
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,7 @@ end
Substitutions(subs, deps) = Substitutions(subs, deps, nothing)

Base.nameof(sys::AbstractSystem) = getfield(sys, :name)
description(sys::AbstractSystem) = has_description(sys) ? get_description(sys) : ""

#Deprecated
function independent_variable(sys::AbstractSystem)
Expand Down Expand Up @@ -1895,7 +1896,7 @@ function Base.show(io::IO, mime::MIME"text/plain", sys::AbstractSystem; hint = t
rows = first(displaysize(io)) ÷ 5 # then allocate ≈1/5 of display height to each list

# Print name and description
desc = get_description(sys)
desc = description(sys)
printstyled(io, "Model ", nameof(sys), ":"; bold)
!isempty(desc) && print(io, " ", desc)

Expand All @@ -1909,7 +1910,7 @@ function Base.show(io::IO, mime::MIME"text/plain", sys::AbstractSystem; hint = t
sub = subs[i]
name = String(nameof(sub))
print(io, "\n ", name)
desc = get_description(sub)
desc = description(sub)
if !isempty(desc)
maxlen = displaysize(io)[2] - length(name) - 6 # remaining length of line
if limit && length(desc) > maxlen
Expand Down Expand Up @@ -2913,7 +2914,7 @@ end
function AbstractTrees.printnode(
io::IO, sys::AbstractSystem; describe = false, bold = false)
printstyled(io, nameof(sys); bold)
describe && !isempty(get_description(sys)) && print(io, ": ", get_description(sys))
describe && !isempty(description(sys)) && print(io, ": ", description(sys))
end
"""
hierarchy(sys::AbstractSystem; describe = false, bold = describe, kwargs...)
Expand Down Expand Up @@ -3006,7 +3007,7 @@ 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), get_description.([sys, basesys])), " ") # concatenate non-empty descriptions with space
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)
Expand Down
2 changes: 1 addition & 1 deletion src/systems/diffeqs/odesystem.jl
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ function flatten(sys::ODESystem, noeqs = false)
discrete_events = discrete_events(sys),
defaults = defaults(sys),
name = nameof(sys),
description = get_description(sys),
description = description(sys),
initialization_eqs = initialization_equations(sys),
is_dde = is_dde(sys),
checks = false)
Expand Down
4 changes: 2 additions & 2 deletions src/systems/diffeqs/sdesystem.jl
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ function stochastic_integral_transform(sys::SDESystem, correction_factor)
end

SDESystem(deqs, get_noiseeqs(sys), get_iv(sys), unknowns(sys), parameters(sys),
name = name, description = get_description(sys),
name = name, description = description(sys),
parameter_dependencies = parameter_dependencies(sys), checks = false)
end

Expand Down Expand Up @@ -464,7 +464,7 @@ function Girsanov_transform(sys::SDESystem, u; θ0 = 1.0)
# return modified SDE System
SDESystem(deqs, noiseeqs, get_iv(sys), unknown_vars, parameters(sys);
defaults = Dict=> θ0), observed = [weight ~ θ / θ0],
name = name, description = get_description(sys),
name = name, description = description(sys),
parameter_dependencies = parameter_dependencies(sys),
checks = false)
end
Expand Down
2 changes: 1 addition & 1 deletion src/systems/discrete_system/discrete_system.jl
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ function flatten(sys::DiscreteSystem, noeqs = false)
observed = observed(sys),
defaults = defaults(sys),
name = nameof(sys),
description = get_description(sys),
description = description(sys),
checks = false)
end
end
Expand Down
2 changes: 1 addition & 1 deletion src/systems/nonlinear/nonlinearsystem.jl
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ function flatten(sys::NonlinearSystem, noeqs = false)
observed = observed(sys),
defaults = defaults(sys),
name = nameof(sys),
description = get_description(sys),
description = description(sys),
checks = false)
end
end
Expand Down

0 comments on commit f575351

Please sign in to comment.