Skip to content

Commit f575351

Browse files
committed
Always check if AbstractSystems have a description
1 parent f7e956f commit f575351

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

src/systems/abstractsystem.jl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,7 @@ end
498498
Substitutions(subs, deps) = Substitutions(subs, deps, nothing)
499499

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

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

18971898
# Print name and description
1898-
desc = get_description(sys)
1899+
desc = description(sys)
18991900
printstyled(io, "Model ", nameof(sys), ":"; bold)
19001901
!isempty(desc) && print(io, " ", desc)
19011902

@@ -1909,7 +1910,7 @@ function Base.show(io::IO, mime::MIME"text/plain", sys::AbstractSystem; hint = t
19091910
sub = subs[i]
19101911
name = String(nameof(sub))
19111912
print(io, "\n ", name)
1912-
desc = get_description(sub)
1913+
desc = description(sub)
19131914
if !isempty(desc)
19141915
maxlen = displaysize(io)[2] - length(name) - 6 # remaining length of line
19151916
if limit && length(desc) > maxlen
@@ -2913,7 +2914,7 @@ end
29132914
function AbstractTrees.printnode(
29142915
io::IO, sys::AbstractSystem; describe = false, bold = false)
29152916
printstyled(io, nameof(sys); bold)
2916-
describe && !isempty(get_description(sys)) && print(io, ": ", get_description(sys))
2917+
describe && !isempty(description(sys)) && print(io, ": ", description(sys))
29172918
end
29182919
"""
29192920
hierarchy(sys::AbstractSystem; describe = false, bold = describe, kwargs...)
@@ -3006,7 +3007,7 @@ function extend(sys::AbstractSystem, basesys::AbstractSystem; name::Symbol = nam
30063007
cevs = union(get_continuous_events(basesys), get_continuous_events(sys))
30073008
devs = union(get_discrete_events(basesys), get_discrete_events(sys))
30083009
defs = merge(get_defaults(basesys), get_defaults(sys)) # prefer `sys`
3009-
desc = join(filter(desc -> !isempty(desc), get_description.([sys, basesys])), " ") # concatenate non-empty descriptions with space
3010+
desc = join(filter(desc -> !isempty(desc), description.([sys, basesys])), " ") # concatenate non-empty descriptions with space
30103011
meta = union_nothing(get_metadata(basesys), get_metadata(sys))
30113012
syss = union(get_systems(basesys), get_systems(sys))
30123013
args = length(ivs) == 0 ? (eqs, sts, ps) : (eqs, ivs[1], sts, ps)

src/systems/diffeqs/odesystem.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ function flatten(sys::ODESystem, noeqs = false)
399399
discrete_events = discrete_events(sys),
400400
defaults = defaults(sys),
401401
name = nameof(sys),
402-
description = get_description(sys),
402+
description = description(sys),
403403
initialization_eqs = initialization_equations(sys),
404404
is_dde = is_dde(sys),
405405
checks = false)

src/systems/diffeqs/sdesystem.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ function stochastic_integral_transform(sys::SDESystem, correction_factor)
355355
end
356356

357357
SDESystem(deqs, get_noiseeqs(sys), get_iv(sys), unknowns(sys), parameters(sys),
358-
name = name, description = get_description(sys),
358+
name = name, description = description(sys),
359359
parameter_dependencies = parameter_dependencies(sys), checks = false)
360360
end
361361

@@ -464,7 +464,7 @@ function Girsanov_transform(sys::SDESystem, u; θ0 = 1.0)
464464
# return modified SDE System
465465
SDESystem(deqs, noiseeqs, get_iv(sys), unknown_vars, parameters(sys);
466466
defaults = Dict=> θ0), observed = [weight ~ θ / θ0],
467-
name = name, description = get_description(sys),
467+
name = name, description = description(sys),
468468
parameter_dependencies = parameter_dependencies(sys),
469469
checks = false)
470470
end

src/systems/discrete_system/discrete_system.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ function flatten(sys::DiscreteSystem, noeqs = false)
226226
observed = observed(sys),
227227
defaults = defaults(sys),
228228
name = nameof(sys),
229-
description = get_description(sys),
229+
description = description(sys),
230230
checks = false)
231231
end
232232
end

src/systems/nonlinear/nonlinearsystem.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ function flatten(sys::NonlinearSystem, noeqs = false)
561561
observed = observed(sys),
562562
defaults = defaults(sys),
563563
name = nameof(sys),
564-
description = get_description(sys),
564+
description = description(sys),
565565
checks = false)
566566
end
567567
end

0 commit comments

Comments
 (0)