Fix some broken slicing operations

Author: mtfishman

src/fillarrays/kroneckerarray.jl

@@ -22,8 +22,13 @@ const KroneckerSquareEye{T,A<:AbstractMatrix{T},B<:SquareEye{T}} = KroneckerMatr
 const SquareEyeSquareEye{T,A<:SquareEye{T},B<:SquareEye{T}} = KroneckerMatrix{T,A,B}
 
 _getindex(a::Eye, I1::Colon, I2::Colon) = a
+_getindex(a::Eye, I1::Base.Slice, I2::Base.Slice) = a
+_getindex(a::Eye, I1::Base.Slice, I2::Colon) = a
+_getindex(a::Eye, I1::Colon, I2::Base.Slice) = a
 _view(a::Eye, I1::Colon, I2::Colon) = a
 _view(a::Eye, I1::Base.Slice, I2::Base.Slice) = a
+_view(a::Eye, I1::Base.Slice, I2::Colon) = a
+_view(a::Eye, I1::Colon, I2::Base.Slice) = a
 
 # Like `adapt` but preserves `Eye`.
 _adapt(to, a::Eye) = a

src/kroneckerarray.jl

@@ -167,13 +167,18 @@ function Base.getindex(a::KroneckerArray{<:Any,N}, I::Vararg{Integer,N}) where {
   return a[I′...]
 end
 
+# Indexing logic.
+function Base.to_indices(a::KroneckerArray, inds, I::Tuple{Union{CartesianPair,CartesianProduct},Vararg})
+  I1 = to_indices(arg1(a), arg1.(inds), arg1.(I))
+  I2 = to_indices(arg2(a), arg2.(inds), arg2.(I))
+  return I1 .× I2
+end
+
 # Allow customizing for `FillArrays.Eye`.
 _getindex(a::AbstractArray, I...) = a[I...]
-function Base.getindex(a::KroneckerArray{<:Any,N}, I::Vararg{CartesianProduct,N}) where {N}
-  return _getindex(arg1(a), arg1.(I)...) ⊗ _getindex(arg2(a), arg2.(I)...)
-end
-function Base.getindex(a::KroneckerArray{<:Any,N}, I::Vararg{CartesianPair,N}) where {N}
-  return _getindex(arg1(a), arg1.(I)...) ⊗ _getindex(arg2(a), arg2.(I)...)
+function Base.getindex(a::KroneckerArray{<:Any,N}, I::Vararg{Union{CartesianPair,CartesianProduct},N}) where {N}
+  I′ = to_indices(a, I)
+  return _getindex(arg1(a), arg1.(I′)...) ⊗ _getindex(arg2(a), arg2.(I′)...)
 end
 # Fix ambigiuity error.
 Base.getindex(a::KroneckerArray{<:Any,0}) = arg1(a)[] * arg2(a)[]

test/test_blocksparsearrays.jl

@@ -48,7 +48,7 @@ arrayts = (Array, JLArray)
   @test a[Block(2, 2)[(2:3) × (2:3), (2:3) × (2:3)]] ==
     a[Block(2, 2)][(2:3) × (2:3), (2:3) × (2:3)]
   @test a[Block(2, 2)[(:) × (2:3), (:) × (2:3)]] == a[Block(2, 2)][(:) × (2:3), (:) × (2:3)]
-  @test_broken a[Block(2, 2)][(1:2) × (2:3), (:) × (2:3)]
+  @test a[Block(2, 2)[(1:2) × (2:3), (:) × (2:3)]] == a[Block(2, 2)][(1:2) × (2:3), (:) × (2:3)]
 
   # Blockwise slicing, shows up in truncated block sparse matrix factorizations.
   I1 = BlockIndexVector(Block(1), Base.Slice(Base.OneTo(2)) × [1])
@@ -169,7 +169,7 @@ end
   @test a[Block(2, 2)[(2:3) × (2:3), (2:3) × (2:3)]] ==
     a[Block(2, 2)][(2:3) × (2:3), (2:3) × (2:3)]
   @test a[Block(2, 2)[(:) × (2:3), (:) × (2:3)]] == a[Block(2, 2)][(:) × (2:3), (:) × (2:3)]
-  @test_broken a[Block(2, 2)][(1:2) × (2:3), (:) × (2:3)]
+  @test a[Block(2, 2)[(1:2) × (2:3), (:) × (2:3)]] == a[Block(2, 2)][(1:2) × (2:3), (:) × (2:3)]
 
   # Blockwise slicing, shows up in truncated block sparse matrix factorizations.
   I1 = BlockIndexVector(Block(1), Base.Slice(Base.OneTo(2)) × [1])