add show_construction for named systems

Author: baggepinnen

src/RobustAndOptimalControl.jl

@@ -28,9 +28,6 @@ using DescriptorSystems: dss
 
 using ChainRulesCore
 
-export show_construction, vec2sys
-include("utils.jl")
-
 export dss, hinfnorm2, linfnorm2, h2norm, hankelnorm, nugap, νgap, baltrunc2, stab_unstab, baltrunc_unstab, baltrunc_coprime
 include("descriptor.jl")
 
@@ -83,4 +80,7 @@ include("mimo_diskmargin.jl")
 export nu_reduction, nu_reduction_recursive
 include("mcm_nugap.jl")
 
+export show_construction, vec2sys
+include("utils.jl")
+
 end

src/lqg.jl

@@ -358,7 +358,6 @@ function ff_controller(l::LQGProblem, L = lqr(l), K = kalman(l); comp_dc = true)
         return I(size(Cc, 1)) - ss(Ac, Bc, Cc, Dc, l.timeevol)
     end
 end
-end
 
 """
     closedloop(l::LQGProblem, L = lqr(l), K = kalman(l))

src/utils.jl

@@ -48,6 +48,24 @@ function show_construction(io::IO, sys::LTISystem; name = "temp", letb = true)
     nothing
 end
 
+function show_construction(io::IO, sys::NamedStateSpace; name = "temp", letb = true)
+    # sys = StateSpace(sys)
+    letb && println(io, "$name = let")
+    prestr = letb ? "    " : "" 
+    println(io, prestr*"$(name)A = ", sys.A)
+    println(io, prestr*"$(name)B = ", sys.B)
+    println(io, prestr*"$(name)C = ", sys.C)
+    println(io, prestr*"$(name)D = ", sys.D)
+    letb || print(io, "$name = ")
+    if isdiscrete(sys)
+        println(io, prestr*"named_ss(ss($(name)A, $(name)B, $(name)C, $(name)D), $(sys.Ts), x=$(sys.x), u=$(sys.u), y=$(sys.y))")
+    else
+        println(io, prestr*"named_ss(ss($(name)A, $(name)B, $(name)C, $(name)D), x=$(sys.x), u=$(sys.u), y=$(sys.y))")
+    end
+    letb && println(io, "end")
+    nothing
+end
+
 function Base.vec(sys::LTISystem)
     [vec(sys.A); vec(sys.B); vec(sys.C); vec(sys.D)]
 end

test/test_named_systems2.jl

@@ -16,6 +16,8 @@ s_autoname = named_ss(G1, :G)
 @test s_autoname.y == [:Gy]
 @test s_autoname.u == [:Gu]
 
+@test_nowarn RobustAndOptimalControl.show_construction(s_autoname)
+
 @test ControlSystemsBase.state_names(s_autoname) == string.(s_autoname.x)
 @test ControlSystemsBase.input_names(s_autoname, 1) == string.(s_autoname.u[])
 @test_throws BoundsError ControlSystemsBase.output_names(s_autoname, 2)