Skip to content

Commit 04bb12c

Browse files
committed
restore sub/diagonaldata
1 parent 872e8f4 commit 04bb12c

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ MatrixFactorizations = "a3b82374-2e81-5b9e-98ce-41277c0e4c87"
1717
SemiseparableMatrices = "f8ebbe35-cbfb-4060-bf7f-b10e4670cf57"
1818

1919
[compat]
20-
ArrayLayouts = "0.6"
20+
ArrayLayouts = "0.5.1, 0.6"
2121
BandedMatrices = "0.16"
2222
BlockArrays = "0.14.5"
2323
BlockBandedMatrices = "0.10"

src/InfiniteLinearAlgebra.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import Base: +, -, *, /, \, ^, OneTo, getindex, promote_op, _unsafe_getindex, si
88
import Base.Broadcast: BroadcastStyle, Broadcasted, broadcasted
99

1010
import ArrayLayouts: colsupport, rowsupport, triangularlayout, MatLdivVec, triangulardata, TriangularLayout, TridiagonalLayout,
11-
sublayout, _qr, __qr, MatLmulVec, MatLmulMat, AbstractQLayout, materialize!, subdiag, supdiag,
11+
sublayout, _qr, __qr, MatLmulVec, MatLmulMat, AbstractQLayout, materialize!, diagonaldata, subdiagonaldata, supdiagonaldata,
1212
_bidiag_forwardsub!, mulreduce, RangeCumsum
1313
import BandedMatrices: BandedMatrix, _BandedMatrix, AbstractBandedMatrix, bandeddata, bandwidths, BandedColumns, bandedcolumns,
1414
_default_banded_broadcast, banded_similar

src/banded/infbanded.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
_BandedMatrix(data::AbstractMatrix{T}, ::Infinity, l, u) where T = _BandedMatrix(data, ℵ₀, l, u)
2+
13
###
24
# BandIndexing
35
###
@@ -439,8 +441,8 @@ mulreduce(M::Mul{<:AbstractQLayout, <:PertToeplitzLayout}) = ApplyArray(M)
439441

440442
function _bidiag_forwardsub!(M::Ldiv{<:Any,<:PaddedLayout})
441443
A, b_in = M.A, M.B
442-
dv = diag(A)
443-
ev = subdiag(A)
444+
dv = diagonaldata(A)
445+
ev = subdiagonaldata(A)
444446
b = paddeddata(b_in)
445447
N = length(b)
446448
b[1] = bj1 = dv[1]\b[1]

src/inful.jl

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,26 +35,26 @@ function _ultailL1(C::AbstractMatrix, A::AbstractMatrix, B::AbstractMatrix)
3535
end
3636

3737
function _ul(::TridiagonalToeplitzLayout, J::AbstractMatrix, ::Val{false}; check::Bool = true)
38-
C = getindex_value(subdiag(J))
39-
A = getindex_value(diag(J))
40-
B = getindex_value(supdiag(J))
38+
C = getindex_value(subdiagonaldata(J))
39+
A = getindex_value(diagonaldata(J))
40+
B = getindex_value(supdiagonaldata(J))
4141
L = _ultailL1(C, A, B)
4242
U = B/L
4343
UL(Tridiagonal(Fill(convert(typeof(L),C),∞), Fill(L,∞), Fill(U,∞)), OneToInf(), 0)
4444
end
4545

4646
function _ul(::TridiagonalToeplitzLayout, J::AbstractMatrix, ::Val{true}; check::Bool = true)
47-
C = getindex_value(subdiag(J))
48-
A = getindex_value(diag(J))
49-
B = getindex_value(supdiag(J))
47+
C = getindex_value(subdiagonaldata(J))
48+
A = getindex_value(diagonaldata(J))
49+
B = getindex_value(supdiagonaldata(J))
5050
A^2 4B*C || error("Pivotting not implemented")
5151
ul(J, Val(false))
5252
end
5353

5454
function _ul(::BlockTridiagonalToeplitzLayout, J::AbstractMatrix, ::Val{false}; check::Bool = true)
55-
C = getindex_value(subdiag(blocks(J)))
56-
A = getindex_value(diag(blocks(J)))
57-
B = getindex_value(supdiag(blocks(J)))
55+
C = getindex_value(subdiagonaldata(blocks(J)))
56+
A = getindex_value(diagonaldata(blocks(J)))
57+
B = getindex_value(supdiagonaldata(blocks(J)))
5858
L = _ultailL1(C, A, B)
5959
U = B/L
6060
UL(mortar(Tridiagonal(Fill(convert(typeof(L),C),∞), Fill(L,∞), Fill(U,∞))), OneToInf(), 0)

0 commit comments

Comments
 (0)