Add more tests for blocktype and blockstype

Author: mtfishman

src/blocksparsearrayinterface/blocksparsearrayinterface.jl

@@ -41,6 +41,9 @@ function eachstoredblock(a::AbstractArray)
   return storedvalues(blocks(a))
 end
 
+function blockstype(a::AbstractArray)
+  return typeof(blocks(a))
+end
 function blocktype(a::AbstractArray)
   if isempty(blocks(a))
     # TODO: Unfortunately, this doesn't always give
@@ -63,6 +66,12 @@ function blocktype(a::AbstractArray)
   return mapreduce(typeof, promote_type, blocks(a))
 end
 
+using BlockArrays: BlockArray
+blockstype(::Type{<:BlockArray{<:Any,<:Any,B}}) where {B} = B
+blockstype(a::BlockArray) = blockstype(typeof(a))
+blocktype(arraytype::Type{<:BlockArray}) = eltype(blockstype(arraytype))
+blocktype(a::BlockArray) = eltype(blocks(a))
+
 abstract type AbstractBlockSparseArrayInterface <: AbstractSparseArrayInterface end
 
 # TODO: Also support specifying the `blocktype` along with the `eltype`.

test/test_basics.jl

@@ -132,8 +132,34 @@ arrayts = (Array, JLArray)
       end
     end
   end
-  @testset "blocktype" begin
-    @test blocktype(arrayt(randn(elt, 2, 2))) <: SubArray{elt,2,arrayt{elt,2}}
+  @testset "blockstype, blocktype" begin
+    a = arrayt(randn(elt, 2, 2))
+    @test blockstype(a) <: BlockArrays.BlocksView{elt,2}
+    # TODO: This is difficult to determine just from type information.
+    @test_broken blockstype(typeof(a)) <: BlockArrays.BlocksView{elt,2}
+    @test blocktype(a) <: SubArray{elt,2,arrayt{elt,2}}
+    # TODO: This is difficult to determine just from type information.
+    @test_broken blocktype(typeof(a)) <: SubArray{elt,2,arrayt{elt,2}}
+
+    a = BlockSparseMatrix{elt,arrayt{elt,2}}([1, 1], [1, 1])
+    @test blockstype(a) <: SparseMatrixDOK{arrayt{elt,2}}
+    @test blockstype(typeof(a)) <: SparseMatrixDOK{arrayt{elt,2}}
+    @test blocktype(a) <: arrayt{elt,2}
+    @test blocktype(typeof(a)) <: arrayt{elt,2}
+
+    a = BlockArray(arrayt(randn(elt, (2, 2))), [1, 1], [1, 1])
+    @test blockstype(a) === Matrix{arrayt{elt,2}}
+    @test blockstype(typeof(a)) === Matrix{arrayt{elt,2}}
+    @test blocktype(a) <: arrayt{elt,2}
+    @test blocktype(typeof(a)) <: arrayt{elt,2}
+
+    a = BlockedArray(arrayt(randn(elt, 2, 2)), [1, 1], [1, 1])
+    @test blockstype(a) <: BlockArrays.BlocksView{elt,2}
+    # TODO: This is difficult to determine just from type information.
+    @test_broken blockstype(typeof(a)) <: BlockArrays.BlocksView{elt,2}
+    @test blocktype(a) <: SubArray{elt,2,arrayt{elt,2}}
+    # TODO: This is difficult to determine just from type information.
+    @test_broken blocktype(typeof(a)) <: SubArray{elt,2,arrayt{elt,2}}
   end
   @testset "Basics" begin
     a = dev(BlockSparseArray{elt}([2, 3], [2, 3]))