Merge pull request #123 from JuliaControl/numtype

allow scaling with number to change element type

Author: baggepinnen

src/named_systems2.jl

@@ -432,8 +432,9 @@ function Base.:*(s1::NamedStateSpace{T}, s2::NamedStateSpace{T}) where {T <: CS.
 end
 
 function Base.:*(s1::Number, s2::NamedStateSpace{T, S}) where {T <: CS.TimeEvolution, S}
-    return NamedStateSpace{T,S}(
-        s1*s2.sys,
+    s3 = s1*s2.sys
+    return NamedStateSpace{T, typeof(s3)}(
+        s3,
         s2.x,
         s2.u,
         [Symbol(string(y)*"_scaled") for y in s2.y],
@@ -443,8 +444,9 @@ function Base.:*(s1::Number, s2::NamedStateSpace{T, S}) where {T <: CS.TimeEvolu
 end
 
 function Base.:*(s1::NamedStateSpace{T, S}, s2::Number) where {T <: CS.TimeEvolution, S}
-    return NamedStateSpace{T,S}(
-        s1.sys*s2,
+    s3 = s1.sys*s2
+    return NamedStateSpace{T,typeof(s3)}(
+        s3,
         s1.x,
         [Symbol(string(u)*"_scaled") for u in s1.u],
         s1.y,

test/test_named_systems2.jl

@@ -104,6 +104,9 @@ s2 = named_ss(G2, x = [:z], u = [:u2], y=[:y2])
 
     s11 = s1*s1
     @test allunique(s11.x)
+
+    @test ControlSystemsBase.numeric_type(big(1.0)*s1) <: BigFloat
+    @test ControlSystemsBase.numeric_type(s1*big(1.0)) <: BigFloat
 end
 
 @testset "Concatenation" begin