wrappers for ess

Author: baggepinnen

src/ExtendedStateSpace.jl

@@ -375,18 +375,30 @@ macro sizecompat(a,b)
     end
 end
 
-function ControlSystems.balance_statespace(G::ExtendedStateSpace, perm::Bool=false)
-    Gs = ss(G)
-    Gs, T = ControlSystems.balance_statespace(Gs, perm)
-    partition(Gs, G.nw, G.nz), T
-end
 
-function ControlSystems.balreal(G::ExtendedStateSpace, args...; kwargs...)
-    Gs = ss(G)
-    Gs, S, T = ControlSystems.balreal(Gs, args...; kwargs...)
-    partition(Gs, G.nw, G.nz), S, T
+function esswrap(f, sys,  args...; kwargs...)
+    Gs = ss(sys)
+    ret = f(Gs, args...; kwargs...)
+    if ret isa AbstractStateSpace
+        Gs = ret
+        return partition(Gs, sys.nw, sys.nz)
+    else
+        Gs = first(ret)
+        return (partition(Gs, sys.nw, sys.nz), Base.tail(ret)...)
+    end
 end
 
+ControlSystems.balance_statespace(G::ExtendedStateSpace, args...; kwargs...) = esswrap(balance_statespace, G, args...; kwargs...)
+
+ControlSystems.similarity_transform(G::ExtendedStateSpace, args...; kwargs...) = esswrap(similarity_transform, G, args...; kwargs...)
+
+ControlSystems.balreal(G::ExtendedStateSpace, args...; kwargs...) = esswrap(balreal, G, args...; kwargs...)
+modal_form(G::ExtendedStateSpace, args...; kwargs...) = esswrap(modal_form, G, args...; kwargs...)
+schur_form(G::ExtendedStateSpace, args...; kwargs...) = esswrap(schur_form, G, args...; kwargs...)
+hess_form(G::ExtendedStateSpace, args...; kwargs...) = esswrap(hess_form, G, args...; kwargs...)
+
+
+
 # This version is not correct for the intended usage
 # function ControlSystems.feedback(s1::ExtendedStateSpace, s2::ExtendedStateSpace;
 #     Wperm=:, Zperm=:)

test/test_extendedstatespace.jl

@@ -62,3 +62,8 @@ G = ssrand(3,4,5)
 Ge = partition(G, 1, 1)
 @test ss(balance_statespace(Ge)[1]) == balance_statespace(G)[1]
 @test ss(balreal(Ge)[1]) == balreal(G)[1]
+@test ss(modal_form(Ge)[1]) == modal_form(G)[1]
+@test ss(schur_form(Ge)[1]) == schur_form(G)[1]
+@test ss(hess_form(Ge)[1]) == hess_form(G)[1]
+
+