Skip to content

Commit 97862c5

Browse files
Replace AbstractTriangular by UpperOrLowerTriangular (#217)
* Replace `AbstractTriangular` by `UpperOrLowerTriangular` * bump patch version --------- Co-authored-by: Sheehan Olver <solver@mac.com>
1 parent 3c12489 commit 97862c5

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "FillArrays"
22
uuid = "1a297f60-69ca-5386-bcde-b61e274b549b"
3-
version = "0.13.7"
3+
version = "0.13.8"
44

55
[deps]
66
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

src/FillArrays.jl

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ import Base: size, getindex, setindex!, IndexStyle, checkbounds, convert,
99
show, view, in, mapreduce, one, reverse
1010

1111
import LinearAlgebra: rank, svdvals!, tril, triu, tril!, triu!, diag, transpose, adjoint, fill!,
12-
dot, norm2, norm1, normInf, normMinusInf, normp, lmul!, rmul!, diagzero, AbstractTriangular, AdjointAbsVec, TransposeAbsVec,
12+
dot, norm2, norm1, normInf, normMinusInf, normp, lmul!, rmul!, diagzero, AdjointAbsVec, TransposeAbsVec,
1313
issymmetric, ishermitian, AdjOrTransAbsVec, checksquare
1414

15+
1516
import Base.Broadcast: broadcasted, DefaultArrayStyle, broadcast_shape
1617

1718
import Statistics: mean, std, var, cov, cor
@@ -348,10 +349,13 @@ end
348349
@inline RectDiagonal{T}(A::V, args...) where {T,V} = RectDiagonal{T,V}(A, args...)
349350
@inline RectDiagonal(A::V, args...) where {V} = RectDiagonal{eltype(V),V}(A, args...)
350351

352+
const UpperOrUnitUpperTriangular{T,S} = Union{UpperTriangular{T,S}, UnitUpperTriangular{T,S}}
353+
const LowerOrUnitLowerTriangular{T,S} = Union{LowerTriangular{T,S}, UnitLowerTriangular{T,S}}
354+
const UpperOrLowerTriangular{T,S} = Union{UpperOrUnitUpperTriangular{T,S}, LowerOrUnitLowerTriangular{T,S}}
351355

352356
# patch missing overload from Base
353357
axes(rd::Diagonal{<:Any,<:AbstractFill}) = (axes(rd.diag,1),axes(rd.diag,1))
354-
axes(T::AbstractTriangular{<:Any,<:AbstractFill}) = axes(parent(T))
358+
axes(T::UpperOrLowerTriangular{<:Any,<:AbstractFill}) = axes(parent(T))
355359

356360
axes(rd::RectDiagonal) = rd.axes
357361
size(rd::RectDiagonal) = map(length, rd.axes)
@@ -672,7 +676,7 @@ Base.print_matrix_row(io::IO,
672676
AbstractFillMatrix,
673677
Diagonal{<:Any,<:AbstractFillVector},
674678
RectDiagonal,
675-
AbstractTriangular{<:Any,<:AbstractFillMatrix}
679+
UpperOrLowerTriangular{<:Any,<:AbstractFillMatrix}
676680
}, A::Vector,
677681
i::Integer, cols::AbstractVector, sep::AbstractString, idxlast::Integer=last(axes(X, 2))) =
678682
axes_print_matrix_row(axes(X), io, X, A, i, cols, sep)

0 commit comments

Comments
 (0)