add promotion for TF<->named_ss

Author: baggepinnen

src/hinfinity_design.jl

@@ -566,7 +566,7 @@ function _scalematrix(A::AbstractMatrix; method = :QR)
     elseif method === :SVD
         return _coordinatetransformsvd(A)
     else
-        error("The method $method is not supported, use 'QR' or 'SVD' instad.")
+        error("The method $method is not supported, use `:QR` or `:SVD` instead.")
     end
 end
 

src/named_systems2.jl

@@ -64,6 +64,12 @@ function Base.promote_rule(::Type{NamedStateSpace{TE, StateSpace{TE, T1}}}, ::Ty
     NamedStateSpace{TE, StateSpace{TE, promote_type(T1,eltype(MT))}}
 end
 
+function Base.promote_rule(::Type{U}, ::Type{NamedStateSpace{T, S}}) where
+    {T, TF, U<:TransferFunction{<:Any, TF} , S<:AbstractStateSpace{T}} 
+    inner = promote_type(U,S)
+    NamedStateSpace{T, inner}
+end
+
 
 
 function Base.convert(::Type{NamedStateSpace{T, S}}, s::U) where {T, S <: AbstractStateSpace, U <: AbstractStateSpace}
@@ -82,6 +88,11 @@ function Base.convert(::Type{NamedStateSpace{T, S}}, s::NamedStateSpace{T, U}) w
     NamedStateSpace{T,typeof(sys)}(sys, s.x, s.u, s.y, s.name)
 end
 
+function Base.convert(::Type{NamedStateSpace{T, S}}, s::U) where {T, S <: AbstractStateSpace, U <: TransferFunction}
+    s2 = Base.convert(S, s)
+    named_ss(s2, x = gensym("x"), u = gensym("u"), y = gensym("y"))
+end
+
 # function Base.convert(::Type{TransferFunction{TE, S}}, s::U) where {TE, S, U <: NamedStateSpace{TE}}
 #     convert(TransferFunction{TE, S}, s.sys)
 # end

test/test_named_systems2.jl

@@ -189,6 +189,17 @@ s2 = named_ss(G2, x = [:z], u = [:u1], y=[:y2])
     G1 = named_ss(ssrand(1,1,1, Ts=1), "G1")
     G2 = named_ss(ssrand(1,1,1, Ts=1), "G2")
     gangoffourplot(G1, G2) # tests some convert methods for I to discrete
+
+
+    G1 = named_ss(ssrand(1,1,1), "G1")
+    # Scalars
+    @test_nowarn G1*1
+    @test_nowarn 1*G1
+
+    # Transfer function
+    @test (G1*tf(1, [1,1])).sys == (G1*ss(tf(1, [1,1]))).sys
+    @test (tf(1, [1,1])*G1).sys == (ss(tf(1, [1,1]))*G1).sys
+
 end