scaled names for matrix multiplication

Author: baggepinnen

src/named_systems2.jl

@@ -299,6 +299,34 @@ function Base.:*(s1::NamedStateSpace{T, S}, s2::Number) where {T <: CS.TimeEvolu
     )
 end
 
+function Base.:*(s1::AbstractMatrix, s2::NamedStateSpace{T, S}) where {T <: CS.TimeEvolution, S}
+    if isdiag(s1)
+        return NamedStateSpace{T,S}(
+            s1*s2.sys,
+            s2.x,
+            s2.u,
+            [Symbol(string(y)*"_scaled") for y in s2.y],
+            isempty(s2.name) ? "" : s2.name*"_scaled",
+        )
+    else
+        return *(promote(s1, s2)...)
+    end
+end
+
+function Base.:*(s1::NamedStateSpace{T, S}, s2::AbstractMatrix) where {T <: CS.TimeEvolution, S}
+    if isdiag(s2)
+        return NamedStateSpace{T,S}(
+            s1.sys*s2,
+            s1.x,
+            [Symbol(string(u)*"_scaled") for u in s1.u],
+            s1.y,
+            isempty(s1.name) ? "" : s1.name*"_scaled",
+        )
+    else
+        return *(promote(s1, s2)...)
+    end
+end
+
 function Base.:/(s::NamedStateSpace{T, S}, n::Number) where {T <: CS.TimeEvolution, S}
     s*(1/n)
 end

test/test_named_systems2.jl

@@ -200,6 +200,16 @@ s2 = named_ss(G2, x = [:z], u = [:u1], y=[:y2])
     @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
 
+    # Matrix
+    @test (G1*ones(1,1)).sys == (G1*ss(ones(1,1))).sys
+    @test (ones(1,1)*G1).sys == (ss(ones(1,1))*G1).sys
+
+    # if the matrix is diagonal, the names are `u_scaled`
+    @test endswith(string((G1*ones(1,1)).u[]), "_scaled")
+
+    # If the matrix is not diagonal, the names are generic
+    G1 = named_ss(ssrand(1,2,1), "G1")
+    @test !endswith(string((G1*ones(2,2)).u[1]), "_scaled")
 end