Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "InfiniteArrays"
uuid = "4858937d-0d70-526a-a4dd-2d5cb5dd786c"
version = "0.15.1"
version = "0.15.2"

[deps]
ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
Expand Down
6 changes: 4 additions & 2 deletions ext/InfiniteArraysBlockArraysExt.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ module InfiniteArraysBlockArraysExt
using InfiniteArrays, BlockArrays
using InfiniteArrays.ArrayLayouts, InfiniteArrays.LazyArrays, InfiniteArrays.LinearAlgebra

import Base: length, size, axes, BroadcastStyle, copy, +, -
import Base: length, size, axes, BroadcastStyle, copy, +, -, maximum, OneTo
import Base.Broadcast: Broadcasted
import ArrayLayouts: sub_materialize, axes_print_matrix_row
import InfiniteArrays: OneToInf, PosInfinity, InfRanges, RealInfinity, Infinity, InfStepRange, TridiagonalToeplitzLayout
import InfiniteArrays: OneToInf, PosInfinity, InfRanges, RealInfinity, Infinity, InfStepRange, TridiagonalToeplitzLayout, InfiniteCardinal
import BlockArrays: AbstractBlockLayout, sizes_from_blocks, BlockTridiagonal, OneToCumsum, BlockSlice, AbstractBlockedUnitRange,
BlockLayout
import LazyArrays: PaddedColumns, LazyArrayStyle
Expand All @@ -28,6 +28,8 @@ BlockArrays.blocklasts(a::InfRanges) = Fill(length(a),1)

BlockArrays.findblock(::BlockedOneTo, ::RealInfinity) = Block(ℵ₀)

maximum(::BlockRange{1, Tuple{OneTo{InfiniteCardinal{0}}}}) = Block(ℵ₀)

function BlockArrays.sortedunion(a::Vcat{Int,1,<:Tuple{Union{Int,AbstractVector{Int}},<:AbstractRange}},
b::Vcat{Int,1,<:Tuple{Union{Int,AbstractVector{Int}},<:AbstractRange}})
@assert a == b # TODO: generailse? Not sure how to do so in a type stable fashion
Expand Down
5 changes: 5 additions & 0 deletions test/test_infblock.jl
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,11 @@ const BlockTriPertToeplitz = InfiniteArraysBlockArraysExt.BlockTriPertToeplitz
@test findblock(blockedrange(1:2:∞), RealInfinity()) == Block(ℵ₀)
end

@testset "maximum of Inf Block Range" begin
# See https://github.com/JuliaApproximation/HarmonicOrthogonalPolynomials.jl/pull/89
@test maximum(Block.(Base.OneTo(Integer(+∞)))) == Block(ℵ₀)
end

@testset "BlockTridiagonal Pert Toeplitz" begin
A = BlockTridiagonal(Vcat([fill(1.0, 2, 1), Matrix(1.0I, 2, 2), Matrix(1.0I, 2, 2), Matrix(1.0I, 2, 2)], Fill(Matrix(1.0I, 2, 2), ∞)),
Vcat([zeros(1, 1)], Fill(zeros(2, 2), ∞)),
Expand Down
Loading