Skip to content

Commit a282035

Browse files
authored
import paddeddata to BlockArrays extension (#212)
* import paddeddata * Update test_infblock.jl
1 parent 13184d6 commit a282035

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "InfiniteArrays"
22
uuid = "4858937d-0d70-526a-a4dd-2d5cb5dd786c"
3-
version = "0.15.2"
3+
version = "0.15.3"
44

55
[deps]
66
ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"

ext/InfiniteArraysBlockArraysExt.jl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ using InfiniteArrays.ArrayLayouts, InfiniteArrays.LazyArrays, InfiniteArrays.Lin
44

55
import Base: length, size, axes, BroadcastStyle, copy, +, -, maximum, OneTo
66
import Base.Broadcast: Broadcasted
7-
import ArrayLayouts: sub_materialize, axes_print_matrix_row
87
import InfiniteArrays: OneToInf, PosInfinity, InfRanges, RealInfinity, Infinity, InfStepRange, TridiagonalToeplitzLayout, InfiniteCardinal
9-
import BlockArrays: AbstractBlockLayout, sizes_from_blocks, BlockTridiagonal, OneToCumsum, BlockSlice, AbstractBlockedUnitRange,
10-
BlockLayout
11-
import LazyArrays: PaddedColumns, LazyArrayStyle
8+
import BlockArrays: AbstractBlockLayout, sizes_from_blocks, BlockTridiagonal, OneToCumsum, BlockSlice, AbstractBlockedUnitRange, BlockLayout
9+
import InfiniteArrays.ArrayLayouts: sub_materialize, axes_print_matrix_row
10+
import InfiniteArrays.LazyArrays: PaddedColumns, LazyArrayStyle, paddeddata
1211

1312
const OneToInfCumsum = RangeCumsum{Int,OneToInf{Int}}
1413

test/test_infblock.jl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,11 @@ const BlockTriPertToeplitz = InfiniteArraysBlockArraysExt.BlockTriPertToeplitz
5252
end
5353

5454
@testset "padded" begin
55-
c = BlockedArray([1; zeros(∞)], Vcat(2, Fill(3, ∞)))
55+
c = BlockedArray([1; 0; 2; zeros(∞)], Vcat(2, Fill(3, ∞)))
5656
@test c + c isa BlockedVector
57+
@test MemoryLayout(c) isa LazyArrays.PaddedColumns
58+
@test MemoryLayout(c[Block.(2:∞)]) isa LazyArrays.PaddedColumns
59+
@test c[Block.(2:∞)][Block(1)] == [2,0,0]
5760
end
5861

5962

0 commit comments

Comments
 (0)