Skip to content

Add AbstractArray conversions for AbstractQ #1470

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

Merged
merged 1 commit into from
Oct 17, 2025
Merged

Add AbstractArray conversions for AbstractQ #1470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 12 additions & 9 deletions src/abstractq.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,13 @@ convert(::Type{AbstractQ{T}}, adjQ::AdjointQ) where {T} = convert(AbstractQ{T},

# ... to matrix
Matrix{T}(Q::AbstractQ) where {T} = convert(Matrix{T}, Q*I) # generic fallback, yields square matrix
Matrix{T}(adjQ::AdjointQ{S}) where {T,S} = convert(Matrix{T}, lmul!(adjQ, Matrix{S}(I, size(adjQ))))
Matrix(Q::AbstractQ{T}) where {T} = Matrix{T}(Q)
Array{T}(Q::AbstractQ) where {T} = Matrix{T}(Q)
Array(Q::AbstractQ) = Matrix(Q)
AbstractMatrix(Q::AbstractQ) = Q*I
AbstractArray(Q::AbstractQ) = AbstractMatrix(Q)
AbstractMatrix{T}(Q::AbstractQ) where {T} = Matrix{T}(Q)
AbstractArray{T}(Q::AbstractQ) where {T} = AbstractMatrix{T}(Q)
convert(::Type{T}, Q::AbstractQ) where {T<:AbstractArray} = T(Q)
# legacy
@deprecate(convert(::Type{AbstractMatrix{T}}, Q::AbstractQ) where {T},
Expand Down Expand Up @@ -172,10 +175,10 @@ qsize_check(Q::AbstractQ, P::AbstractQ) =
# mimic the AbstractArray fallback
*(Q::AbstractQ{<:Number}) = Q

(*)(Q::AbstractQ, J::UniformScaling) = Q*J.λ
function (*)(Q::AbstractQ, b::Number)
T = promote_type(eltype(Q), typeof(b))
lmul!(convert(AbstractQ{T}, Q), Matrix{T}(b*I, size(Q)))
(*)(Q::AbstractQ, b::Number) = Q*(b*I)
function (*)(Q::AbstractQ, J::UniformScaling)
T = promote_type(eltype(Q), eltype(J))
lmul!(convert(AbstractQ{T}, Q), Matrix{T}(J, size(Q)))
end
function (*)(Q::AbstractQ, B::AbstractVector)
T = promote_type(eltype(Q), eltype(B))
Expand All @@ -188,10 +191,10 @@ function (*)(Q::AbstractQ, B::AbstractMatrix)
mul!(similar(B, T, (size(Q, 1), size(B, 2))), convert(AbstractQ{T}, Q), B)
end

(*)(J::UniformScaling, Q::AbstractQ) = J.λ*Q
function (*)(a::Number, Q::AbstractQ)
T = promote_type(typeof(a), eltype(Q))
rmul!(Matrix{T}(a*I, size(Q)), convert(AbstractQ{T}, Q))
(*)(a::Number, Q::AbstractQ) = (a*I)*Q
function (*)(J::UniformScaling, Q::AbstractQ)
T = promote_type(eltype(J), eltype(Q))
rmul!(Matrix{T}(J, size(Q)), convert(AbstractQ{T}, Q))
end
function (*)(A::AbstractVector, Q::AbstractQ)
T = promote_type(eltype(A), eltype(Q))
Expand Down
1 change: 1 addition & 0 deletions test/abstractq.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ n = 5
end
@test convert(Matrix, Q) ≈ Matrix(Q) ≈ Q[:,:] ≈ copyto!(zeros(T, size(Q)), Q) ≈ Q.Q*I
@test convert(Matrix, Q') ≈ Matrix(Q') ≈ (Q')[:,:] ≈ copyto!(zeros(T, size(Q)), Q') ≈ Q.Q'*I
@test AbstractMatrix(Q) ≈ AbstractArray(Q) ≈ AbstractMatrix{T}(Q) ≈ AbstractArray{T}(Q)
@test Q[1,:] == Q.Q[1,:] == view(Q, 1, :)
@test Q[:,1] == Q.Q[:,1] == view(Q, :, 1)
@test Q[1,1] == Q.Q[1,1]
Expand Down