Merge pull request #872 from JuliaControl/colonind

fix transfer function colon indexing
JuliaControl · Sep 13, 2023 · f3848b2 · f3848b2 · baggepinnen · Sep 13, 2023
2 parents 6540a25 + d8a077a
commit f3848b2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/lib/ControlSystemsBase/Project.toml b/lib/ControlSystemsBase/Project.toml
@@ -1,8 +1,8 @@
 name = "ControlSystemsBase"
 uuid = "aaaaaaaa-a6ca-5380-bf3e-84a91bcd477e"
 authors = ["Dept. Automatic Control, Lund University"]
-repo = "https://github.com/JuliaControl/ControlSystemsBase.jl.git"
-version = "1.9.0"
+repo = "https://github.com/JuliaControl/ControlSystems.jl.git"
+version = "1.9.1"
 
 [deps]
 DSP = "717857b8-e6f2-59f4-9121-6e50c889abd2"

diff --git a/lib/ControlSystemsBase/src/types/TransferFunction.jl b/lib/ControlSystemsBase/src/types/TransferFunction.jl
@@ -55,7 +55,11 @@ function Base.getindex(G::TransferFunction{TE,S}, inds...) where {TE,S<:SisoTf}
         error("Must specify 2 indices to index TransferFunction model")
     end
     rows, cols = index2range(inds...)
-    mat = Matrix{S}(undef, length(rows), length(cols))
+    mat = Matrix{S}(
+        undef,
+        rows isa Colon ? noutputs(G) : length(rows),
+        cols isa Colon ? ninputs(G) : length(cols)
+    )
     mat[:, :] = G.matrix[rows, cols]
     return TransferFunction(mat, G.timeevol)
 end

diff --git a/lib/ControlSystemsBase/test/test_transferfunction.jl b/lib/ControlSystemsBase/test/test_transferfunction.jl
@@ -153,6 +153,8 @@ M = randn(2,1)
 @test C_222[1,1] == tf([1, 2, 3], [1, 8, 15])
 @test C_222[1:1,1] == tf([1, 2, 3], [1, 8, 15])
 @test C_222[1,1:2] == C_221
+@test C_222[1,:] == C_221
+@test C_222[:,:] == C_222
 @test size(C_222[1,[]]) == (1,0)
 
 # Accessing Ts through .Ts