Use unpack for inheritance

Author: YingboMa

examples/electrical_components.jl

@@ -1,14 +1,13 @@
 using Test
 using ModelingToolkit, OrdinaryDiffEq
 
-# Basic electric components
 @parameters t
 @connector function Pin(;name)
     sts = @variables v(t)=1.0 i(t)=1.0
-    ODESystem(Equation[], t, sts, [], name=name)
+    ODESystem(Equation[], t, sts, []; name=name)
 end
 
-@namespace function ModelingToolkit.connect(::Type{Pin}, ps...)
+function ModelingToolkit.connect(::Type{Pin}, ps...)
     eqs = [
            0 ~ sum(p->p.i, ps) # KCL
           ]
@@ -20,61 +19,62 @@ end
     return eqs
 end
 
-@namespace function Ground(;name)
+function Ground(;name)
     @named g = Pin()
     eqs = [g.v ~ 0]
-    ODESystem(eqs, t, [], [], systems=[g], name=name)
+    ODESystem(eqs, t, [], [], systems=[g]; name=name)
 end
 
-@namespace function ConstantVoltage(;name, V = 1.0)
+function OnePort(;name)
     @named p = Pin()
     @named n = Pin()
-    ps = @parameters V=V
+    sts = @variables v(t)=1.0 i(t)=1.0
     eqs = [
-           V ~ p.v - n.v
+           v ~ p.v - n.v
            0 ~ p.i + n.i
+           i ~ p.i
           ]
-    ODESystem(eqs, t, [], ps, systems=[p, n], name=name)
+    ODESystem(eqs, t, sts, [], systems=[p, n]; name=name)
 end
 
-@namespace function Resistor(;name, R = 1.0)
-    @named p = Pin()
-    @named n = Pin()
-    sts = @variables v(t)
+function ConstantVoltage(;name, V = 1.0)
+    @named oneport = OnePort()
+    @unpack v = oneport
+    ps = @parameters V=V
+    eqs = [
+           V ~ v
+          ]
+    extend(oneport, ODESystem(eqs, t, [], ps; name=name); name=name)
+end
+
+function Resistor(;name, R = 1.0)
+    @named oneport = OnePort()
+    @unpack v, i = oneport
     ps = @parameters R=R
     eqs = [
-           v ~ p.v - n.v
-           0 ~ p.i + n.i
-           v ~ p.i * R
+           v ~ i * R
           ]
-    ODESystem(eqs, t, sts, ps, systems=[p, n], name=name)
+    extend(oneport, ODESystem(eqs, t, [], ps; name=name); name=name)
 end
 
-@namespace function Capacitor(;name, C = 1.0)
-    @named p = Pin()
-    @named n = Pin()
-    sts = @variables v(t)
+function Capacitor(;name, C = 1.0)
+    @named oneport = OnePort()
+    @unpack v, i = oneport
     ps = @parameters C=C
     D = Differential(t)
     eqs = [
-           v ~ p.v - n.v
-           0 ~ p.i + n.i
-           D(v) ~ p.i / C
+           D(v) ~ i / C
           ]
-    ODESystem(eqs, t, sts, ps, systems=[p, n], name=name)
+    extend(oneport, ODESystem(eqs, t, [], ps; name=name); name=name)
 end
 
-@namespace function Inductor(; name, L = 1.0)
-    @named p = Pin()
-    @named n = Pin()
-    sts = @variables v(t) i(t)
+function Inductor(; name, L = 1.0)
+    @named oneport = OnePort()
+    @unpack v, i = oneport
     ps = @parameters L=L
     D = Differential(t)
     eqs = [
-           v ~ p.v - n.v
-           0 ~ p.i + n.i
-           i ~ p.i
            D(i) ~ v / L
           ]
-    ODESystem(eqs, t, sts, ps, systems=[p, n], name=name)
+    extend(oneport, ODESystem(eqs, t, [], ps; name=name); name=name)
 end

examples/rc_model.jl

@@ -8,7 +8,7 @@ V = 1.0
 @named source = ConstantVoltage(V=V)
 @named ground = Ground()
 
-rc_eqs = @namespace [
+rc_eqs = [
           connect(source.p, resistor.p)
           connect(resistor.n, capacitor.p)
           connect(capacitor.n, source.n, ground.g)

examples/serial_inductor.jl

@@ -6,7 +6,7 @@ include("electrical_components.jl")
 @named inductor2 = Inductor(L=2.0e-2)
 @named ground = Ground()
 
-eqs = @namespace [
+eqs = [
        connect(source.p, resistor.p)
        connect(resistor.n, inductor1.p)
        connect(inductor1.n, inductor2.p)

test/components.jl

@@ -5,40 +5,36 @@ include("../examples/rc_model.jl")
 
 sys = structural_simplify(rc_model)
 @test !isempty(ModelingToolkit.defaults(sys))
-u0 = @namespace [
+u0 = [
       capacitor.v => 0.0
       capacitor.p.i => 0.0
       resistor.v => 0.0
      ]
 prob = ODEProblem(sys, u0, (0, 10.0))
 sol = solve(prob, Rodas4())
 
-@namespace begin
-      @test sol[resistor.p.i] == sol[capacitor.p.i]
-      @test sol[resistor.n.i] == -sol[capacitor.p.i]
-      @test sol[capacitor.n.i] == -sol[capacitor.p.i]
-      @test iszero(sol[ground.g.i])
-      @test iszero(sol[ground.g.v])
-      @test sol[resistor.v] == sol[source.p.v] - sol[capacitor.p.v]
-end
+@test sol[resistor.p.i] == sol[capacitor.p.i]
+@test sol[resistor.n.i] == -sol[capacitor.p.i]
+@test sol[capacitor.n.i] == -sol[capacitor.p.i]
+@test iszero(sol[ground.g.i])
+@test iszero(sol[ground.g.v])
+@test sol[resistor.v] == sol[source.p.v] - sol[capacitor.p.v]
 
 prob = ODAEProblem(sys, u0, (0, 10.0))
 sol = solve(prob, Tsit5())
 
-@namespace begin
-      @test sol[resistor.p.i] == sol[capacitor.p.i]
-      @test sol[resistor.n.i] == -sol[capacitor.p.i]
-      @test sol[capacitor.n.i] == -sol[capacitor.p.i]
-      @test iszero(sol[ground.g.i])
-      @test iszero(sol[ground.g.v])
-      @test sol[resistor.v] == sol[source.p.v] - sol[capacitor.p.v]
-end
+@test sol[resistor.p.i] == sol[capacitor.p.i]
+@test sol[resistor.n.i] == -sol[capacitor.p.i]
+@test sol[capacitor.n.i] == -sol[capacitor.p.i]
+@test iszero(sol[ground.g.i])
+@test iszero(sol[ground.g.v])
+@test sol[resistor.v] == sol[source.p.v] - sol[capacitor.p.v]
 #using Plots
 #plot(sol)
 
 include("../examples/serial_inductor.jl")
 sys = structural_simplify(ll_model)
-u0 = @namespace [
+u0 = [
       inductor1.i => 0.0
       inductor2.i => 0.0
       inductor2.v => 0.0

test/lowering_solving.jl

@@ -50,26 +50,24 @@ lorenz2 = ODESystem(eqs,name=:lorenz2)
 
 @variables α(t)
 @parameters γ
-connections = @namespace [0 ~ lorenz1.x + lorenz2.y + α*γ]
+connections = [0 ~ lorenz1.x + lorenz2.y + α*γ]
 connected = ODESystem(connections,t,[α],[γ],systems=[lorenz1,lorenz2])
 
-@namespace begin
-      u0 = [lorenz1.x => 1.0,
-            lorenz1.y => 0.0,
-            lorenz1.z => 0.0,
-            lorenz2.x => 0.0,
-            lorenz2.y => 1.0,
-            lorenz2.z => 0.0,
-            α => 2.0]
+u0 = [lorenz1.x => 1.0,
+      lorenz1.y => 0.0,
+      lorenz1.z => 0.0,
+      lorenz2.x => 0.0,
+      lorenz2.y => 1.0,
+      lorenz2.z => 0.0,
+      α => 2.0]
 
-      p  = [lorenz1.σ => 10.0,
-            lorenz1.ρ => 28.0,
-            lorenz1.β => 8/3,
-            lorenz2.σ => 10.0,
-            lorenz2.ρ => 28.0,
-            lorenz2.β => 8/3,
-            γ => 2.0]
-end
+p  = [lorenz1.σ => 10.0,
+      lorenz1.ρ => 28.0,
+      lorenz1.β => 8/3,
+      lorenz2.σ => 10.0,
+      lorenz2.ρ => 28.0,
+      lorenz2.β => 8/3,
+      γ => 2.0]
 
 tspan = (0.0,100.0)
 prob = ODEProblem(connected,u0,tspan,p)

test/nonlinearsystem.jl

@@ -90,23 +90,23 @@ lorenz = name -> NonlinearSystem(eqs1, [x,y,z,u,F], [σ,ρ,β], name=name)
 lorenz1 = lorenz(:lorenz1)
 @test_throws ArgumentError NonlinearProblem(lorenz1, zeros(5))
 lorenz2 = lorenz(:lorenz2)
-connected = NonlinearSystem((@namespace [s ~ a + lorenz1.x
+connected = NonlinearSystem([s ~ a + lorenz1.x
                              lorenz2.y ~ s
                              lorenz1.F ~ lorenz2.u
-                             lorenz2.F ~ lorenz1.u]), [s, a], [], systems=[lorenz1,lorenz2])
+                             lorenz2.F ~ lorenz1.u], [s, a], [], systems=[lorenz1,lorenz2])
 @test_nowarn alias_elimination(connected)
 
 # system promotion
 using OrdinaryDiffEq
 @variables t
 D = Differential(t)
 @named subsys = convert_system(ODESystem, lorenz1, t)
-@named sys = ODESystem((@namespace [D(subsys.x) ~ subsys.x + subsys.x]), t, systems=[subsys])
+@named sys = ODESystem([D(subsys.x) ~ subsys.x + subsys.x], t, systems=[subsys])
 sys = structural_simplify(sys)
-u0 = @namespace [subsys.x => 1, subsys.z => 2.0]
-prob = ODEProblem(sys, u0, (0, 1.0), @namespace [subsys.σ=>1,subsys.ρ=>2,subsys.β=>3])
+u0 = [subsys.x => 1, subsys.z => 2.0]
+prob = ODEProblem(sys, u0, (0, 1.0), [subsys.σ=>1,subsys.ρ=>2,subsys.β=>3])
 sol = solve(prob, Rodas5())
-@test @namespace sol[subsys.x] + sol[subsys.y] - sol[subsys.z] ≈ sol[subsys.u]
+@test sol[subsys.x] + sol[subsys.y] - sol[subsys.z] ≈ sol[subsys.u]
 @test_throws ArgumentError convert_system(ODESystem, sys, t)
 
 @parameters t σ ρ β
@@ -132,7 +132,7 @@ np = NonlinearProblem(ns, [0,0,0], [1,2,3], jac=true, sparse=true)
        function issue819()
            sys1 = makesys(:sys1)
            sys2 = makesys(:sys1)
-           @test_throws ArgumentError NonlinearSystem((@namespace [sys2.f ~ sys1.x, sys1.f ~ 0]), [], [], systems = [sys1, sys2])
+           @test_throws ArgumentError NonlinearSystem([sys2.f ~ sys1.x, sys1.f ~ 0], [], [], systems = [sys1, sys2])
        end
        issue819()
 end

test/optimizationsystem.jl

@@ -8,7 +8,7 @@ sys2 = OptimizationSystem(loss,[x,y],[a,b],name=:sys2)
 
 @variables z
 @parameters β
-loss2 = @namespace sys1.x - sys2.y + z*β
+loss2 = sys1.x - sys2.y + z*β
 combinedsys = OptimizationSystem(loss2,[z],[β],systems=[sys1,sys2],name=:combinedsys)
 
 equations(combinedsys)
@@ -22,14 +22,14 @@ generate_gradient(combinedsys)
 generate_hessian(combinedsys)
 ModelingToolkit.hessian_sparsity(combinedsys)
 
-u0 = @namespace [
+u0 = [
     sys1.x=>1.0
     sys1.y=>2.0
     sys2.x=>3.0
     sys2.y=>4.0
     z=>5.0
 ]
-p = @namespace [
+p = [
     sys1.a => 6.0
     sys1.b => 7.0
     sys2.a => 8.0

test/reactionsystem_components.jl

@@ -20,13 +20,13 @@ pars  = [α₀,α,K,n,δ,β,μ]
 @named os₁ = convert(ODESystem, rs; include_zero_odes=false)
 @named os₂ = convert(ODESystem, rs; include_zero_odes=false)
 @named os₃ = convert(ODESystem, rs; include_zero_odes=false)
-connections = @namespace [os₁.R ~ os₃.P,
+connections = [os₁.R ~ os₃.P,
                os₂.R ~ os₁.P,
                os₃.R ~ os₂.P]
 @named connected = ODESystem(connections, t, [], [], systems=[os₁,os₂,os₃])
 oderepressilator = structural_simplify(connected)
 
-pvals = @namespace [os₁.α₀ => 5e-4,
+pvals = [os₁.α₀ => 5e-4,
          os₁.α => .5,
          os₁.K => 40.0,
          os₁.n => 2,
@@ -47,7 +47,7 @@ pvals = @namespace [os₁.α₀ => 5e-4,
          os₃.δ => (log(2)/120),
          os₃.β => (20*log(2)/120),
          os₃.μ => (log(2)/600)]
-u₀    = @namespace [os₁.m => 0.0, os₁.P => 20.0, os₂.m => 0.0, os₂.P => 0.0, os₃.m => 0.0, os₃.P => 0.0]
+u₀    = [os₁.m => 0.0, os₁.P => 20.0, os₂.m => 0.0, os₂.P => 0.0, os₃.m => 0.0, os₃.P => 0.0]
 tspan = (0.0, 100000.0)
 oprob = ODEProblem(oderepressilator, u₀, tspan, pvals)
 sol = solve(oprob, Tsit5())