Y+I fixes

Author: dlfivefifty

src/banded/tridiagonalconjugation.jl

@@ -290,14 +290,15 @@ getindex(K::SubArray{<:Any,1,<:TridiagonalConjugationBand}, k::AbstractInfUnitRa
 copy(A::TridiagonalConjugationBand) = A # immutable
 
 
-const TridiagonalConjugation{T} = Tridiagonal{T, TridiagonalConjugationBand{T}}
-const SymTridiagonalConjugation{T} = SymTridiagonal{T, TridiagonalConjugationBand{T}}
+# Use LazyBandedMatrices.Tridiagonal to support algebra
+const TridiagonalConjugation{T} = LazyBandedMatrices.Tridiagonal{T, TridiagonalConjugationBand{T}, TridiagonalConjugationBand{T}, TridiagonalConjugationBand{T}}
+const SymTridiagonalConjugation{T} = LazyBandedMatrices.SymTridiagonal{T, TridiagonalConjugationBand{T}, TridiagonalConjugationBand{T}}
 function TridiagonalConjugation(R, X, Y...)
     data = TridiagonalConjugationData(R, X, Y...)
-    Tridiagonal(TridiagonalConjugationBand(data, :dl), TridiagonalConjugationBand(data, :d), TridiagonalConjugationBand(data, :du))
+    LazyBandedMatrices.Tridiagonal(TridiagonalConjugationBand(data, :dl), TridiagonalConjugationBand(data, :d), TridiagonalConjugationBand(data, :du))
 end
 
 function SymTridiagonalConjugation(R, X, Y...)
     data = TridiagonalConjugationData(R, X, Y...)
-    SymTridiagonal(TridiagonalConjugationBand(data, :d), TridiagonalConjugationBand(data, :du))
+    LazyBandedMatrices.SymTridiagonal(TridiagonalConjugationBand(data, :d), TridiagonalConjugationBand(data, :du))
 end

src/infcholesky.jl

@@ -36,6 +36,8 @@ copy(A::AdaptiveCholeskyFactors) = AdaptiveCholeskyFactors(copy(A.data), copy(A.
 copy(A::Adjoint{T,<:AdaptiveCholeskyFactors}) where T = copy(parent(A))'
 copy(A::Transpose{T,<:AdaptiveCholeskyFactors}) where T = transpose(copy(parent(A)))
 
+cache_layout(::TriangularLayout{'U', 'N', AdaptiveCholeskyFactorsBandedLayout}, A::AbstractMatrix) = A # already cached
+
 function partialcholesky!(F::AdaptiveCholeskyFactors{T,<:BandedMatrix}, n::Int) where T
     if n > F.ncols
         _,u = bandwidths(F.data.array)

src/infqr.jl

@@ -5,7 +5,7 @@ mutable struct AdaptiveQRData{T,DM<:AbstractMatrix{T}}
     ncols::Int
 end
 
-function AdaptiveQRData(::Union{SymmetricLayout{<:AbstractBandedLayout},AbstractBandedLayout}, A::AbstractMatrix{T}) where T
+function AdaptiveQRData(::BandedLayouts, A::AbstractMatrix{T}) where T
     l,u = bandwidths(A)
     FT = float(T)
     data = BandedMatrix{FT}(undef,(2l+u+1,0),(l,l+u)) # pad super

test/test_bidiagonalconjugation.jl

@@ -185,19 +185,15 @@ end
         R,X = (_BandedMatrix(Vcat(-Ones(1,∞)/2, Zeros(1,∞), Hcat(Ones(1,1),Ones(1,∞)/2)), ℵ₀, 0,2),
                 LazyBandedMatrices.Tridiagonal(Vcat(1.0, Fill(1/2,∞)), Zeros(∞), Fill(1/2,∞)))
 
-        Y = TridiagonalConjugation(R, X)
-        n = 100_000
-        @test Y[n,n+1] ≈ 1/2
-
-        Y = SymTridiagonalConjugation(R, X)
-        n = 100_000
-        @test Y[n,n+1] ≈ 1/2
-
-        @testset "Y+I" begin
-            Y+I
-            Y-I
-            I+Y
-            I-Y
+        for Y in (TridiagonalConjugation(R, X), SymTridiagonalConjugation(R, X))
+            n = 100_000
+            @test Y[n,n+1] ≈ 1/2
+
+            @testset "Y+I" begin
+                @test (Y+I)[1:10,1:10] == (I+Y)[1:10,1:10] == I + Y[1:10,1:10]
+                @test (Y-I)[1:10,1:10] == Y[1:10,1:10] - I
+                @test (I-Y)[1:10,1:10] == I - Y[1:10,1:10]
+            end
         end
     end
 end