Skip to content

allow scaling with number to change element type #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 24, 2025
Merged

allow scaling with number to change element type #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/named_systems2.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand All @@ -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,
Expand Down
3 changes: 3 additions & 0 deletions test/test_named_systems2.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading