Skip to content

Commit d049598

Browse files
authored
Support plotting lazy * (#177)
* Support plotting lazy * * v0.17.3 * Update ci.yml * Update ci.yml * Update ci.yml * add tests
1 parent 44933ec commit d049598

File tree

5 files changed

+17
-7
lines changed

5 files changed

+17
-7
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,16 @@ jobs:
2121
matrix:
2222
version:
2323
- '1.9'
24+
- '1'
2425
os:
2526
- ubuntu-latest
2627
- macOS-latest
2728
- windows-latest
2829
arch:
2930
- x64
3031
steps:
31-
- uses: actions/checkout@v2
32-
- uses: julia-actions/setup-julia@v1
32+
- uses: actions/checkout@v4
33+
- uses: julia-actions/setup-julia@v2
3334
with:
3435
version: ${{ matrix.version }}
3536
arch: ${{ matrix.arch }}
@@ -46,6 +47,8 @@ jobs:
4647
- uses: julia-actions/julia-buildpkg@v1
4748
- uses: julia-actions/julia-runtest@v1
4849
- uses: julia-actions/julia-processcoverage@v1
49-
- uses: codecov/codecov-action@v1
50+
- uses: codecov/codecov-action@v4
5051
with:
5152
file: lcov.info
53+
token: ${{ secrets.CODECOV_TOKEN }}
54+
fail_ci_if_error: false

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "ContinuumArrays"
22
uuid = "7ae1f121-cc2c-504b-ac30-9b923412ae5c"
3-
version = "0.17.2"
3+
version = "0.17.3"
44

55
[deps]
66
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"

src/bases/bases.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,7 @@ end
533533

534534

535535
# we represent as a Mul with a banded matrix
536+
# sublayout(::AbstractBasisLayout, ::Type{<:Tuple{<:Inclusion,<:Integer}}) = SubBasisLayout()
536537
sublayout(::AbstractBasisLayout, ::Type{<:Tuple{<:Inclusion,<:AbstractVector}}) = SubBasisLayout()
537538
sublayout(::AbstractBasisLayout, ::Type{<:Tuple{<:AbstractAffineQuasiVector,<:AbstractVector}}) = MappedBasisLayout()
538539
sublayout(::WeightedBasisLayouts, ::Type{<:Tuple{<:AbstractAffineQuasiVector,<:AbstractVector}}) = MappedWeightedBasisLayout()

src/plotting.jl

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,16 @@ plotgrid_layout(::SubBasisLayout, P::AbstractQuasiMatrix, n) = plotgrid(parent(P
2121
plotgrid_layout(::SubBasisLayout, P::AbstractQuasiMatrix) = plotgrid(parent(P), maximum(parentindices(P)[2]))
2222

2323

24-
_mul_plotgrid(_, args) = plotgrid_layout(UnknownLayout(), first(args))
25-
_mul_plotgrid(::Tuple{Any,PaddedLayout}, (P,c)) = plotgrid(P, last(colsupport(c)))
24+
_mul_plotgrid(_, args) = plotgrid(args[1], last(colsupport(ApplyArray(*, tail(args)...))))
25+
_mul_plotgrid(_, (P,c)::NTuple{2,Any}) = plotgrid(P, last(colsupport(c)))
2626

27-
function plotgrid_layout(lay::ExpansionLayout, P)
27+
function plotgrid_layout(lay::ApplyLayout{typeof(*)}, P)
2828
args = arguments(lay,P)
2929
_mul_plotgrid(map(MemoryLayout,args), args)
3030
end
3131

32+
plotgrid_layout(::ExpansionLayout, P) = plotgrid_layout(ApplyLayout{typeof(*)}(), P)
33+
3234
plotvalues_size(::Tuple{InfiniteCardinal{1}}, g, x=plotgrid(g)) = g[x]
3335
plotvalues_size(::Tuple{InfiniteCardinal{1},Int}, g, x=plotgrid(g)) = g[x,:]
3436
plotvalues_layout(lay, g, x...) = plotvalues_size(size(g), g, x...)

test/runtests.jl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ include("test_basisconcat.jl")
102102

103103
x,v = plotgridvalues(diff(u))
104104
@test x == [2,2,2,3,3,3,4,4,4]
105+
106+
@test plotgrid(diff(L)) == plotgrid(H)
107+
@test size(plotvalues(diff(L))) == (8,5)
108+
@test plotgrid(ApplyQuasiMatrix(*, diff(L).args..., c)) == plotgrid(H)
105109
end
106110

107111
include("test_recipesbaseext.jl")

0 commit comments

Comments
 (0)