Dl/lazybandedtimespadded (#9)

* banded * padded should be padded

* Update runtests.jl

* more lazy cases

* increase coverage

.gitignore

@@ -3,3 +3,4 @@
 *.jl.mem
 deps/deps.jl
 Manifest.toml
+.DS_Store

Project.toml

@@ -1,7 +1,7 @@
 name = "LazyBandedMatrices"
 uuid = "d7e5e226-e90b-4449-9968-0f923699bf6f"
 authors = ["Sheehan Olver <solver@mac.com>"]
-version = "0.2.5"
+version = "0.2.6"
 
 [deps]
 ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
@@ -20,7 +20,7 @@ BandedMatrices = "0.15.2"
 BlockArrays = "0.12"
 BlockBandedMatrices = "0.8"
 FillArrays = "0.8"
-LazyArrays = "0.16.3"
+LazyArrays = "0.16.5"
 MatrixFactorizations = "0.3.1"
 julia = "1.2"
 

src/LazyBandedMatrices.jl

@@ -16,7 +16,7 @@ import LazyArrays: LazyArrayStyle, combine_mul_styles, mulapplystyle, PaddedLayo
                         LazyLayout, ApplyLayout, BroadcastLayout, FlattenMulStyle, CachedVector,
                         _mul_args_rows, _mul_args_cols, paddeddata, sub_materialize,
                         MulMatrix, Mul, CachedMatrix, CachedArray, cachedlayout, resizedata!, applybroadcaststyle,
-                        LazyMatrix, LazyVector, LazyArray
+                        LazyMatrix, LazyVector, LazyArray, MulAddStyle
 import BandedMatrices: bandedcolumns, bandwidths, isbanded, AbstractBandedLayout,
                         prodbandwidths, BandedStyle, BandedColumns, BandedRows,
                         AbstractBandedMatrix, BandedSubBandedMatrix, BandedStyle, _bnds,
@@ -183,8 +183,12 @@ combine_mul_styles(::MulBandedLayout, ::MulBandedLayout) = LazyArrayApplyStyle()
 combine_mul_styles(::MulBandedLayout, ::BroadcastBandedLayout) = LazyArrayApplyStyle()
 combine_mul_styles(::BroadcastBandedLayout, ::MulBandedLayout) = LazyArrayApplyStyle()
 
+mulapplystyle(::LazyBandedLayout, ::LazyBandedLayout) = LazyArrayApplyStyle()
+mulapplystyle(::LazyBandedLayout, ::AbstractBandedLayout) = LazyArrayApplyStyle()
+mulapplystyle(::AbstractBandedLayout, ::LazyBandedLayout) = LazyArrayApplyStyle()
 mulapplystyle(::LazyBandedLayout, ::MulBandedLayout) = FlattenMulStyle()
 mulapplystyle(::MulBandedLayout, ::LazyBandedLayout) = FlattenMulStyle()
+mulapplystyle(::AbstractBandedLayout, ::PaddedLayout) = MulAddStyle()
 
 
 @inline colsupport(::BroadcastBandedLayout, A, j) = banded_colsupport(A, j)

test/runtests.jl

@@ -1,8 +1,8 @@
 using LazyBandedMatrices, BlockBandedMatrices, BandedMatrices, LazyArrays, 
             ArrayLayouts, MatrixFactorizations, LinearAlgebra, Random, Test
-import LazyArrays: Applied, resizedata!, FillLayout, MulAddStyle, arguments, colsupport, rowsupport
-import LazyBandedMatrices: MulBandedLayout, VcatBandedMatrix, BroadcastBandedLayout, ApplyBandedLayout, BlockKron
-import BandedMatrices: BandedStyle, _BandedMatrix, AbstractBandedMatrix
+import LazyArrays: Applied, resizedata!, FillLayout, MulAddStyle, arguments, colsupport, rowsupport, LazyLayout, ApplyStyle
+import LazyBandedMatrices: MulBandedLayout, VcatBandedMatrix, BroadcastBandedLayout, ApplyBandedLayout, BlockKron, LazyBandedLayout
+import BandedMatrices: BandedStyle, _BandedMatrix, AbstractBandedMatrix, BandedRows, BandedColumns
 
 Random.seed!(0)
 
@@ -39,6 +39,17 @@ BandedMatrices.inbands_getindex(A::PseudoBandedMatrix, j::Int, k::Int) = A.data[
 BandedMatrices.inbands_setindex!(A::PseudoBandedMatrix, v, j::Int, k::Int) = setindex!(A.data, v, j, k)
 LinearAlgebra.fill!(A::PseudoBandedMatrix, v) = fill!(A.data,v)
 
+struct MyLazyArray{T,N} <: AbstractArray{T,N}
+    data::Array{T,N}
+end
+
+
+Base.size(A::MyLazyArray) = size(A.data)
+Base.getindex(A::MyLazyArray, j::Int...) = A.data[j...]
+LazyArrays.MemoryLayout(::Type{<:MyLazyArray}) = LazyLayout()
+LinearAlgebra.factorize(A::MyLazyArray) = factorize(A.data)
+
+
 @testset "Mul" begin
     A = PseudoBandedMatrix(rand(5, 4), 1, 2)
     B = PseudoBandedMatrix(rand(4, 4), 2, 3)
@@ -508,6 +519,27 @@ Base.size(F::FiniteDifference) = (F.n,F.n)
         @test LazyBandedMatrices.resize(view(A,2:3,2:5),5,5) isa BandedMatrix
         @test LazyBandedMatrices.resize(view(A,2:3,2:5),5,5)[1:2,1:4] == A[2:3,2:5]
     end
+
+    @testset "Lazy banded * Padded" begin
+        A = _BandedMatrix(Vcat(BroadcastArray(exp, 1:5)', Ones(1,5)), 5, 1, 0)
+        @test MemoryLayout(A) isa BandedColumns{LazyLayout}
+        x = Vcat([1,2], Zeros(3))
+        @test A*x isa Vcat
+    end
+
+    @testset "Lazy banded" begin
+        A = _BandedMatrix(Ones{Int}(1,10),10,0,0)'
+        B = _BandedMatrix((-2:-2:-20)', 10,-1,1)
+        C = Diagonal( BroadcastVector(/, 2, (1:2:20)))
+        @test MemoryLayout(A) isa BandedRows{FillLayout}
+        @test MemoryLayout(B) isa BandedColumns{UnknownLayout}
+        @test MemoryLayout(C) isa DiagonalLayout{LazyLayout}
+        BC = BroadcastArray(*, B, permutedims(MyLazyArray(Array(C.diag))))
+        @test MemoryLayout(BC) isa LazyBandedLayout
+        @test A*BC isa MulMatrix
+        @test BC*B isa MulMatrix
+        @test BC*BC isa MulMatrix
+    end
 end
 
 @testset "QR" begin