support mortar(::Matrix{Matrix})

Author: dlfivefifty

src/blockarray.jl

@@ -76,6 +76,10 @@ function _BlockArray(blocks::R, block_sizes::Vararg{AbstractVector{Int}, N}) whe
     return _BlockArray(blocks, BlockSizes(block_sizes...))
 end
 
+function _BlockArray(blocks::R, block_sizes::BS) where {T, N, R<:AbstractArray{<:AbstractArray{V,N} where V,N}, BS<:AbstractBlockSizes{N}}
+    _BlockArray(convert(AbstractArray{AbstractArray{mapreduce(eltype,promote_type,blocks),N},N}, blocks), block_sizes)
+end
+
 const BlockMatrix{T, R <: AbstractMatrix{<:AbstractMatrix{T}}} = BlockArray{T, 2, R}
 const BlockVector{T, R <: AbstractVector{<:AbstractVector{T}}} = BlockArray{T, 1, R}
 const BlockVecOrMat{T, R} = Union{BlockMatrix{T, R}, BlockVector{T, R}}

test/test_blockarrays.jl

@@ -442,4 +442,22 @@ end
     B = PseudoBlockArray(vcat(fill([1,2], N)...), BlockArrays.BlockSizes((1:2:2N+1,)))
     @test A == vcat(A.blocks...) == B
     @test A[Block(1)] == B[Block(1)] == [1,2]
+end
+
+@testset "mixed blocks #92" begin
+    A = BlockArray{Any}(undef_blocks, [1,2], [3,2])
+    A.blocks[1,1] = fill(1.0,1,3)
+    A.blocks[1,2] = fill(2,1,2)
+    A.blocks[2,1] = fill(3//3,2,3)
+    A.blocks[2,2] = fill(4.0f0,2,2)
+    @test A[1,1] == 1.0
+    @test A[2,1] == 1//1
+
+    B = Matrix{Matrix}(undef,2,2)
+    B[1,1] = fill(1.0,1,3)
+    B[1,2] = fill(2,1,2)
+    B[2,1] = fill(3//3,2,3)
+    B[2,2] = fill(4.0f0,2,2)
+    @test mortar(B) == A
+    @test mortar(B)[1,1] == 1.0
 end