_plotgrid -> plotgrid_layout

Author: dlfivefifty

src/plotting.jl

@@ -10,19 +10,22 @@ endpoints or singular points not included in `grid`. `n` specifies
 the number of coefficients.
 """
 
-plotgrid(P, n...) = _plotgrid(MemoryLayout(P), P, n...)
-_plotgrid(lay, P, n=size(P,2)) = grid(P, min(n,MAX_PLOT_POINTS))
+const _plotgrid = plotgrid_layout # TODO: remove
 
-_plotgrid(::WeightedBasisLayouts, wP, n...) = plotgrid(unweighted(wP), n...)
-_plotgrid(::MappedBasisLayout, P, n...) = invmap(parentindices(P)[1])[plotgrid(demap(P), n...)]
-_plotgrid(::SubBasisLayout, P::AbstractQuasiMatrix, n) = plotgrid(parent(P), maximum(parentindices(P)[2][n]))
-_plotgrid(::SubBasisLayout, P::AbstractQuasiMatrix) = plotgrid(parent(P), maximum(parentindices(P)[2]))
+plotgrid(P, n...) = plotgrid_layout(MemoryLayout(P), P, n...)
 
+plotgrid_layout(lay, P, n=size(P,2)) = grid(P, min(n,MAX_PLOT_POINTS))
 
-_mul_plotgrid(_, args) = _plotgrid(UnknownLayout(), first(args))
+plotgrid_layout(::WeightedBasisLayouts, wP, n...) = plotgrid(unweighted(wP), n...)
+plotgrid_layout(::MappedBasisLayout, P, n...) = invmap(parentindices(P)[1])[plotgrid(demap(P), n...)]
+plotgrid_layout(::SubBasisLayout, P::AbstractQuasiMatrix, n) = plotgrid(parent(P), maximum(parentindices(P)[2][n]))
+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, maximum(colsupport(c)))
 
-function _plotgrid(lay::ExpansionLayout, P)
+function plotgrid_layout(lay::ExpansionLayout, P)
     args = arguments(lay,P)
     _mul_plotgrid(map(MemoryLayout,args), args)
 end

test/runtests.jl

@@ -1,7 +1,7 @@
 using ContinuumArrays, QuasiArrays, IntervalSets, DomainSets, FillArrays, LinearAlgebra, BandedMatrices, InfiniteArrays, Test, Base64, RecipesBase
 import ContinuumArrays: ℵ₁, materialize, AffineQuasiVector, BasisLayout, AdjointBasisLayout, SubBasisLayout, ℵ₁,
                         MappedBasisLayout, AdjointMappedBasisLayouts, MappedWeightedBasisLayout, TransformFactorization, Weight, WeightedBasisLayout, SubWeightedBasisLayout, WeightLayout,
-                        basis, invmap, Map, checkpoints, _plotgrid, mul, plotvalues
+                        basis, invmap, Map, checkpoints, plotgrid_layout, mul, plotvalues
 import QuasiArrays: SubQuasiArray, MulQuasiMatrix, Vec, Inclusion, QuasiDiagonal, LazyQuasiArrayApplyStyle, LazyQuasiArrayStyle
 import LazyArrays: MemoryLayout, ApplyStyle, Applied, colsupport, arguments, ApplyLayout, LdivStyle, MulStyle
 
@@ -121,7 +121,7 @@ include("test_basisconcat.jl")
         wrep = RecipesBase.apply_recipe(Dict{Symbol, Any}(), v)
         @test wrep[1].args == (grid(wT), v[grid(wT)])
 
-        @test plotgrid(v) == plotgrid(u) == grid(T) == grid(wT) == _plotgrid(MemoryLayout(v), v) == _plotgrid(MemoryLayout(u), u)
+        @test plotgrid(v) == plotgrid(u) == grid(T) == grid(wT) == plotgrid_layout(MemoryLayout(v), v) == plotgrid_layout(MemoryLayout(u), u)
         y = affine(0..1, x)
         @test plotgrid(T[y,:]) == (plotgrid(T) .+ 1)/2
     end