Skip to content

preserve axes in construction #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

preserve axes in construction #122

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4198f3b
preserve axes in construction
dlfivefifty Sep 21, 2021
b310a47
Update BandedBlockBandedMatrix.jl
dlfivefifty Sep 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 28 additions & 10 deletions src/BandedBlockBandedMatrix.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,16 +121,27 @@ function convert(::Type{<:BandedBlockBandedMatrix}, B::BandedMatrix)
end
end

convert(::Type{BandedBlockBandedMatrix{T,BLOCKS,RAXIS}}, A::BandedBlockBandedMatrix) where {T,BLOCKS,RAXIS} =
convert(::Type{BandedBlockBandedMatrix{T,BLOCKS,RAXIS}}, A::BandedBlockBandedMatrix) where {T,BLOCKS,RAXIS<:AbstractUnitRange{Int}} =
_BandedBlockBandedMatrix(convert(BLOCKS, A.data), convert(RAXIS, A.raxis), (A.l, A.u), (A.λ, A.μ))

convert(::Type{BandedBlockBandedMatrix{T,BLOCKS,RAXIS}}, A::BandedBlockBandedMatrix{T,BLOCKS,RAXIS}) where {T,BLOCKS,RAXIS<:AbstractUnitRange{Int}} = A

function BandedBlockBandedMatrix{T,B,R}(Z::Zeros, axes::NTuple{2,AbstractUnitRange{Int}},
lu::NTuple{2,Int}, λμ::NTuple{2,Int}) where {T,B,R<:AbstractUnitRange{Int}}
if size(Z) ≠ map(length,axes)
throw(DimensionMismatch())
end
blocks = fill!(B(undef, _bbb_data_axes(axes[2],lu,λμ)), zero(T))
_BandedBlockBandedMatrix(blocks, convert(R, axes[1]), lu, λμ)
_BandedBlockBandedMatrix(blocks, convert(R, axes[1]), lu, λμ)::BandedBlockBandedMatrix{T,B,R}
end

function BandedBlockBandedMatrix{T}(Z::Zeros, ax::NTuple{2,AbstractUnitRange{Int}},
lu::NTuple{2,Int}, λμ::NTuple{2,Int}) where {T,B,R<:AbstractUnitRange{Int}}
if size(Z) ≠ map(length,ax)
throw(DimensionMismatch())
end
blocks = fill!(PseudoBlockMatrix{T}(undef, _bbb_data_axes(ax[2],lu,λμ)), zero(T))
_BandedBlockBandedMatrix(blocks, ax[1], lu, λμ)::BandedBlockBandedMatrix{T}
end

function BandedBlockBandedMatrix{T,B,R}(E::Eye, axes::NTuple{2,AbstractUnitRange{Int}},
Expand All @@ -155,16 +166,20 @@ BandedBlockBandedMatrix{T,B}(m::Union{AbstractMatrix, UniformScaling},
lu::NTuple{2,Int}, λμ::NTuple{2,Int}) where {T,B} =
BandedBlockBandedMatrix{T,B,typeof(axes[1])}(m, axes, lu, λμ)

BandedBlockBandedMatrix{T}(m::Union{AbstractMatrix, UniformScaling},
axes::NTuple{2,AbstractUnitRange{Int}},
BandedBlockBandedMatrix{T}(A::Union{AbstractMatrix, UniformScaling},
ax::NTuple{2,AbstractUnitRange{Int}},
lu::NTuple{2,Int}, λμ::NTuple{2,Int}) where T =
DefaultBandedBlockBandedMatrix{T}(m, axes, lu, λμ)

_bandedblockbanded_copyto!(BandedBlockBandedMatrix{T}(Zeros{T}(size(A)), ax, lu, λμ), A)
BandedBlockBandedMatrix{T,B,R}(m::Union{AbstractMatrix, UniformScaling},
rdims::AbstractVector{Int}, cdims::AbstractVector{Int},
lu::NTuple{2,Int}, λμ::NTuple{2,Int}) where {T,B,R<:AbstractUnitRange{Int}} =
BandedBlockBandedMatrix{T,B,R}(m, (blockedrange(rdims),blockedrange(cdims)), lu, λμ)

BandedBlockBandedMatrix{T,B,R}(m::Union{AbstractMatrix, UniformScaling}) where {T,B,R} =
BandedBlockBandedMatrix{T,B,R}(m, axes(m), blockbandwidths(m), subblockbandwidths(m))
DefaultBandedBlockBandedMatrix(m::Union{AbstractMatrix, UniformScaling}) = DefaultBandedBlockBandedMatrix{eltype(m)}(m)

BandedBlockBandedMatrix{T,B}(m::Union{AbstractMatrix, UniformScaling},
rdims::AbstractVector{Int}, cdims::AbstractVector{Int},
lu::NTuple{2,Int}, λμ::NTuple{2,Int}) where {T,B} =
Expand All @@ -186,11 +201,14 @@ BandedBlockBandedMatrix(A::Union{AbstractMatrix,UniformScaling},
BandedBlockBandedMatrix(A, (blockedrange(rdims),blockedrange(cdims)), lu, λμ)


function BandedBlockBandedMatrix{T,Blocks,RR}(A::AbstractMatrix, axes::NTuple{2,AbstractUnitRange{Int}}, lu::NTuple{2,Int}, λμ::NTuple{2,Int}) where {T,Blocks,RR<:AbstractUnitRange{Int}}
ret = BandedBlockBandedMatrix{T,Blocks,RR}(Zeros{T}(size(A)), axes, lu, λμ)
L,M = λμ
BandedBlockBandedMatrix{T,Blocks,RR}(A::AbstractMatrix, ax::NTuple{2,AbstractUnitRange{Int}}, lu::NTuple{2,Int}, λμ::NTuple{2,Int}) where {T,Blocks,RR<:AbstractUnitRange{Int}} =
_bandedblockbanded_copyto!(BandedBlockBandedMatrix{T,Blocks,RR}(Zeros{T}(size(A)), ax, lu, λμ), A)

function _bandedblockbanded_copyto!(ret, A)
ax = axes(ret)
L,M = subblockbandwidths(ret)
for J = blockaxes(ret,2), K = blockcolsupport(ret, J)
kr, jr = axes[1][K], axes[2][J]
kr, jr = ax[1][K], ax[2][J]

# We have the correct block - now we need to only add the entries from
# the correct bands
Expand Down