Support plotting lazy * (#177)

* Support plotting lazy * * v0.17.3 * Update ci.yml * Update ci.yml * Update ci.yml * add tests
JuliaApproximation · May 7, 2024 · d049598 · d049598 · dlfivefifty · May 7, 2024
1 parent 44933ec
commit d049598
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,15 +21,16 @@ jobs:
       matrix:
         version:
           - '1.9'
+          - '1'
         os:
           - ubuntu-latest
           - macOS-latest
           - windows-latest
         arch:
           - x64
     steps:
-      - uses: actions/checkout@v2
-      - uses: julia-actions/setup-julia@v1
+      - uses: actions/checkout@v4
+      - uses: julia-actions/setup-julia@v2
         with:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
@@ -46,6 +47,8 @@ jobs:
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
       - uses: julia-actions/julia-processcoverage@v1
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v4
         with:
           file: lcov.info
+          token: ${{ secrets.CODECOV_TOKEN }}
+          fail_ci_if_error: false
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "ContinuumArrays"
 uuid = "7ae1f121-cc2c-504b-ac30-9b923412ae5c"
-version = "0.17.2"
+version = "0.17.3"
 
 [deps]
 AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"

diff --git a/src/bases/bases.jl b/src/bases/bases.jl
@@ -533,6 +533,7 @@ end
 
 
 # we represent as a Mul with a banded matrix
+# sublayout(::AbstractBasisLayout, ::Type{<:Tuple{<:Inclusion,<:Integer}}) = SubBasisLayout()
 sublayout(::AbstractBasisLayout, ::Type{<:Tuple{<:Inclusion,<:AbstractVector}}) = SubBasisLayout()
 sublayout(::AbstractBasisLayout, ::Type{<:Tuple{<:AbstractAffineQuasiVector,<:AbstractVector}}) = MappedBasisLayout()
 sublayout(::WeightedBasisLayouts, ::Type{<:Tuple{<:AbstractAffineQuasiVector,<:AbstractVector}}) = MappedWeightedBasisLayout()

diff --git a/src/plotting.jl b/src/plotting.jl
@@ -21,14 +21,16 @@ plotgrid_layout(::SubBasisLayout, P::AbstractQuasiMatrix, n) = plotgrid(parent(P
 plotgrid_layout(::SubBasisLayout, P::AbstractQuasiMatrix) = plotgrid(parent(P), maximum(parentindices(P)[2]))
 
 
-_mul_plotgrid(_, args) = plotgrid_layout(UnknownLayout(), first(args))
-_mul_plotgrid(::Tuple{Any,PaddedLayout}, (P,c)) = plotgrid(P, last(colsupport(c)))
+_mul_plotgrid(_, args) = plotgrid(args[1], last(colsupport(ApplyArray(*, tail(args)...))))
+_mul_plotgrid(_, (P,c)::NTuple{2,Any}) = plotgrid(P, last(colsupport(c)))
 
-function plotgrid_layout(lay::ExpansionLayout, P)
+function plotgrid_layout(lay::ApplyLayout{typeof(*)}, P)
     args = arguments(lay,P)
     _mul_plotgrid(map(MemoryLayout,args), args)
 end
 
+plotgrid_layout(::ExpansionLayout, P) = plotgrid_layout(ApplyLayout{typeof(*)}(), P)
+
 plotvalues_size(::Tuple{InfiniteCardinal{1}}, g, x=plotgrid(g)) = g[x]
 plotvalues_size(::Tuple{InfiniteCardinal{1},Int}, g, x=plotgrid(g)) = g[x,:]
 plotvalues_layout(lay, g, x...) = plotvalues_size(size(g), g, x...)

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -102,6 +102,10 @@ include("test_basisconcat.jl")
 
     x,v = plotgridvalues(diff(u))
     @test x == [2,2,2,3,3,3,4,4,4]
+
+    @test plotgrid(diff(L)) == plotgrid(H)
+    @test size(plotvalues(diff(L))) == (8,5)
+    @test plotgrid(ApplyQuasiMatrix(*, diff(L).args..., c)) == plotgrid(H)
 end
 
 include("test_recipesbaseext.jl")