move rc_model from components to use in print_tree safetestset

Author: anandijain

test/components.jl

@@ -1,86 +1,8 @@
 using Test
 using ModelingToolkit, OrdinaryDiffEq
 
-# Basic electric components
-const t = Sym{ModelingToolkit.Parameter{Real}}(:t)
-function Pin(;name)
-    @variables v(t) i(t)
-    ODESystem(Equation[], t, [v, i], [], name=name, defaults=[v=>1.0, i=>1.0])
-end
+include("rc_model.jl")
 
-function Ground(name)
-    @named g = Pin()
-    eqs = [g.v ~ 0]
-    ODESystem(eqs, t, [], [], systems=[g], name=name)
-end
-
-function ConstantVoltage(name; V = 1.0)
-    val = V
-    @named p = Pin()
-    @named n = Pin()
-    @parameters V
-    eqs = [
-           V ~ p.v - n.v
-           0 ~ p.i + n.i
-          ]
-    ODESystem(eqs, t, [], [V], systems=[p, n], defaults=Dict(V => val), name=name)
-end
-
-function Resistor(name; R = 1.0)
-    val = R
-    @named p = Pin()
-    @named n = Pin()
-    @variables v(t)
-    @parameters R
-    eqs = [
-           v ~ p.v - n.v
-           0 ~ p.i + n.i
-           v ~ p.i * R
-          ]
-    ODESystem(eqs, t, [v], [R], systems=[p, n], defaults=Dict(R => val), name=name)
-end
-
-function Capacitor(name; C = 1.0)
-    val = C
-    @named p = Pin()
-    @named n = Pin()
-    @variables v(t)
-    @parameters C
-    D = Differential(t)
-    eqs = [
-           v ~ p.v - n.v
-           0 ~ p.i + n.i
-           D(v) ~ p.i / C
-          ]
-    ODESystem(eqs, t, [v], [C], systems=[p, n], defaults=Dict(C => val), name=name)
-end
-
-R = 1.0
-C = 1.0
-V = 1.0
-resistor = Resistor(:resistor, R=R)
-capacitor = Capacitor(:capacitor, C=C)
-source = ConstantVoltage(:source, V=V)
-ground = Ground(:ground)
-
-function connect(ps...)
-    eqs = [
-           0 ~ sum(p->p.i, ps) # KCL
-          ]
-    # KVL
-    for i in 1:length(ps)-1
-        push!(eqs, ps[i].v ~ ps[i+1].v)
-    end
-
-    return eqs
-end
-rc_eqs = [
-          connect(source.p, resistor.p)
-          connect(resistor.n, capacitor.p)
-          connect(capacitor.n, source.n, ground.g)
-         ]
-
-rc_model = ODESystem(rc_eqs, t, systems=[resistor, capacitor, source, ground], name=:rc)
 sys = structural_simplify(rc_model)
 @test !isempty(ModelingToolkit.defaults(sys))
 u0 = [

test/print_tree.jl

@@ -1,6 +1,6 @@
 using ModelingToolkit, AbstractTrees, Test
 
-include("components.jl")
+include("rc_model.jl")
 
 io = IOBuffer()
 print_tree(io, rc_model)

test/rc_model.jl

@@ -0,0 +1,83 @@
+using Test
+using ModelingToolkit, OrdinaryDiffEq
+
+# Basic electric components
+const t = Sym{ModelingToolkit.Parameter{Real}}(:t)
+function Pin(;name)
+    @variables v(t) i(t)
+    ODESystem(Equation[], t, [v, i], [], name=name, defaults=[v=>1.0, i=>1.0])
+end
+
+function Ground(name)
+    @named g = Pin()
+    eqs = [g.v ~ 0]
+    ODESystem(eqs, t, [], [], systems=[g], name=name)
+end
+
+function ConstantVoltage(name; V = 1.0)
+    val = V
+    @named p = Pin()
+    @named n = Pin()
+    @parameters V
+    eqs = [
+           V ~ p.v - n.v
+           0 ~ p.i + n.i
+          ]
+    ODESystem(eqs, t, [], [V], systems=[p, n], defaults=Dict(V => val), name=name)
+end
+
+function Resistor(name; R = 1.0)
+    val = R
+    @named p = Pin()
+    @named n = Pin()
+    @variables v(t)
+    @parameters R
+    eqs = [
+           v ~ p.v - n.v
+           0 ~ p.i + n.i
+           v ~ p.i * R
+          ]
+    ODESystem(eqs, t, [v], [R], systems=[p, n], defaults=Dict(R => val), name=name)
+end
+
+function Capacitor(name; C = 1.0)
+    val = C
+    @named p = Pin()
+    @named n = Pin()
+    @variables v(t)
+    @parameters C
+    D = Differential(t)
+    eqs = [
+           v ~ p.v - n.v
+           0 ~ p.i + n.i
+           D(v) ~ p.i / C
+          ]
+    ODESystem(eqs, t, [v], [C], systems=[p, n], defaults=Dict(C => val), name=name)
+end
+
+R = 1.0
+C = 1.0
+V = 1.0
+resistor = Resistor(:resistor, R=R)
+capacitor = Capacitor(:capacitor, C=C)
+source = ConstantVoltage(:source, V=V)
+ground = Ground(:ground)
+
+function connect(ps...)
+    eqs = [
+           0 ~ sum(p->p.i, ps) # KCL
+          ]
+    # KVL
+    for i in 1:length(ps)-1
+        push!(eqs, ps[i].v ~ ps[i+1].v)
+    end
+
+    return eqs
+end
+rc_eqs = [
+          connect(source.p, resistor.p)
+          connect(resistor.n, capacitor.p)
+          connect(capacitor.n, source.n, ground.g)
+         ]
+
+rc_model = ODESystem(rc_eqs, t, systems=[resistor, capacitor, source, ground], name=:rc)

test/runtests.jl

@@ -35,4 +35,4 @@ println("Last test requires gcc available in the path!")
 @safetestset "Latexify recipes Test" begin include("latexify.jl") end
 @safetestset "StructuralTransformations" begin include("structural_transformation/runtests.jl") end
 @testset "Serialization" begin include("serialization.jl") end
-@testset "print_tree" begin include("print_tree.jl") end
+@safetestset "print_tree" begin include("print_tree.jl") end