BlockDiagonal (#48)

* BlockDiagonal

* Update Project.toml

* bandedata for PseudoBlockMatrix

* Update Project.toml

* Update test_misc.jl

Author: dlfivefifty

Project.toml

@@ -19,9 +19,9 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [compat]
-BandedMatrices = "0.12, 0.13"
+BandedMatrices = "0.13"
 BlockArrays = "0.10"
-FillArrays = "0.7, 0.8"
-LazyArrays = "0.12"
-MatrixFactorizations = "0.1, 0.2"
+FillArrays = "0.8"
+LazyArrays = "0.13"
+MatrixFactorizations = "0.2"
 julia = "1"

src/interfaceimpl.jl

@@ -12,6 +12,8 @@ function blockbandwidths(P::PseudoBlockMatrix{<:Any,<:Diagonal})
     cumulsizes(bs)[1] == cumulsizes(bs)[2] || throw(DimensionMismatch())
     (0,0)
 end
+
+bandeddata(P::PseudoBlockMatrix) = bandeddata(P.blocks)
 bandwidths(P::PseudoBlockMatrix) = bandwidths(P.blocks)
 
 BroadcastStyle(::Type{<:SubArray{<:Any,2,<:PseudoBlockMatrix{<:Any,<:Diagonal},
@@ -38,6 +40,19 @@ BroadcastStyle(::Type{<:SubKron{<:Any,<:Any,B,Block1,Block1}}) where B =
     subblockbandwidths(parent(V))
 
 
+const BlockDiagonal{T,VT<:Matrix{T}} = BlockMatrix{T,<:Diagonal{VT}}
+
+BlockDiagonal(A) = mortar(Diagonal(A))
+
+function sizes_from_blocks(A::Diagonal, _) 
+    # for k = 1:length(A.du)
+    #     size(A.du[k],1) == sz[1][k] || throw(ArgumentError("block sizes of upper diagonal inconsisent with diagonal"))
+    #     size(A.du[k],2) == sz[2][k+1] || throw(ArgumentError("block sizes of upper diagonal inconsisent with diagonal"))
+    #     size(A.dl[k],1) == sz[1][k+1] || throw(ArgumentError("block sizes of lower diagonal inconsisent with diagonal"))
+    #     size(A.dl[k],2) == sz[2][k] || throw(ArgumentError("block sizes of lower diagonal inconsisent with diagonal"))
+    # end
+    BlockSizes(size.(A.diag, 1), size.(A.diag,2))
+end    
 
 
 # Block Tridiagonal
@@ -83,6 +98,13 @@ for op in (:-, :+)
     end
 end
 
+function replace_in_print_matrix(A::BlockDiagonal, i::Integer, j::Integer, s::AbstractString)
+    bi = global2blockindex(A.block_sizes, (i, j))
+    I,J = bi.I
+    i,j = bi.α
+    J-I == 0 ? s : Base.replace_with_centered_mark(s)
+end
+
 function replace_in_print_matrix(A::BlockTridiagonal, i::Integer, j::Integer, s::AbstractString)
     bi = global2blockindex(A.block_sizes, (i, j))
     I,J = bi.I

test/test_misc.jl

@@ -1,7 +1,8 @@
 using LazyArrays, BlockBandedMatrices, BandedMatrices, BlockArrays, LinearAlgebra, Test
 import Base: getindex, size
-import BandedMatrices: bandwidths, AbstractBandedMatrix, BandedStyle
+import BandedMatrices: bandwidths, AbstractBandedMatrix, BandedStyle, bandeddata, BandedColumns
 import BlockArrays: blocksizes, BlockSizes
+import LazyArrays: DenseColumnMajor, DiagonalLayout
 
 struct FiniteDifference{T} <: AbstractBandedMatrix{T}
     n::Int
@@ -68,10 +69,15 @@ size(F::FiniteDifference) = (F.n,F.n)
 
         PD = PseudoBlockArray(D, blocksizes(D_xx).block_sizes)
         @test blockbandwidths(PD) == bandwidths(PD) == (0,0)
+        @test MemoryLayout(typeof(PD)) isa DiagonalLayout{DenseColumnMajor}
+        @test bandeddata(PD) == bandeddata(D)
 
         V = view(PD, Block(1,1))
         @test bandwidths(V) == (0,0)
         @test Broadcast.BroadcastStyle(typeof(V)) == BandedStyle()
+        @test MemoryLayout(typeof(V)) isa BandedColumns{DenseColumnMajor}
+        @test bandeddata(V) == bandeddata(PD)[:,1:n]
+        @test BandedMatrix(V) == V
 
         @test D_xx + D isa BandedBlockBandedMatrix
         @test blockbandwidths(D_xx + D) == blockbandwidths(D_xx)