Skip to content

Commit c10bc9e

Browse files
committed
Change the argument order of extend
1 parent 5ab4c57 commit c10bc9e

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

examples/electrical_components.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function Resistor(;name, R = 1.0)
4444
eqs = [
4545
v ~ i * R
4646
]
47-
extend(oneport, ODESystem(eqs, t, [], ps; name=name); name=name)
47+
extend(ODESystem(eqs, t, [], ps; name=name), oneport)
4848
end
4949

5050
function Capacitor(;name, C = 1.0)
@@ -55,7 +55,7 @@ function Capacitor(;name, C = 1.0)
5555
eqs = [
5656
D(v) ~ i / C
5757
]
58-
extend(oneport, ODESystem(eqs, t, [], ps; name=name); name=name)
58+
extend(ODESystem(eqs, t, [], ps; name=name), oneport)
5959
end
6060

6161
function ConstantVoltage(;name, V = 1.0)
@@ -65,7 +65,7 @@ function ConstantVoltage(;name, V = 1.0)
6565
eqs = [
6666
V ~ v
6767
]
68-
extend(oneport, ODESystem(eqs, t, [], ps; name=name); name=name)
68+
extend(ODESystem(eqs, t, [], ps; name=name), oneport)
6969
end
7070

7171
function Inductor(; name, L = 1.0)
@@ -76,5 +76,5 @@ function Inductor(; name, L = 1.0)
7676
eqs = [
7777
D(i) ~ v / L
7878
]
79-
extend(oneport, ODESystem(eqs, t, [], ps; name=name); name=name)
79+
extend(ODESystem(eqs, t, [], ps; name=name), oneport)
8080
end

src/systems/abstractsystem.jl

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,13 @@ function connect(syss...)
794794
end
795795

796796
# Inheritance
797-
function extend(basesys::AbstractSystem, sys::AbstractSystem; name::Symbol)
797+
"""
798+
$(TYPEDSIGNATURES)
799+
800+
entend the `basesys` with `sys`, the resulting system would inherit `sys`'s name
801+
by default.
802+
"""
803+
function extend(sys::AbstractSystem, basesys::AbstractSystem; name::Symbol=nameof(sys))
798804
T = SciMLBase.parameterless_type(basesys)
799805
iv = independent_variable(basesys)
800806
sys = convert_system(T, sys, iv)

0 commit comments

Comments
 (0)