diff --git a/Project.toml b/Project.toml index 592c24a..294ad99 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "MultivariateOrthogonalPolynomials" uuid = "4f6956fd-4f93-5457-9149-7bfc4b2ce06d" -version = "0.9.10" +version = "0.9.11" [deps] ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" @@ -35,7 +35,7 @@ BandedMatrices = "1" BlockArrays = "1.7.3" BlockBandedMatrices = "0.13" ClassicalOrthogonalPolynomials = "0.15.8" -ContinuumArrays = "0.20.4" +ContinuumArrays = "0.20.4, 0.21" DomainSets = "0.7, 0.8" FastTransforms = "0.17" FillArrays = "1.0" diff --git a/src/MultivariateOrthogonalPolynomials.jl b/src/MultivariateOrthogonalPolynomials.jl index 3ef1cb4..ee530ff 100644 --- a/src/MultivariateOrthogonalPolynomials.jl +++ b/src/MultivariateOrthogonalPolynomials.jl @@ -11,7 +11,7 @@ import Base.Broadcast: Broadcasted, broadcasted, DefaultArrayStyle import DomainSets: boundary, EuclideanDomain import QuasiArrays: LazyQuasiMatrix, LazyQuasiArrayStyle, domain, vec_layout, reshape_layout, pointchoice -import ContinuumArrays: @simplify, Weight, weight, grid, plotgrid, TransformFactorization, ExpansionLayout, plotvalues, unweighted, plan_transform, checkpoints, transform_ldiv, AbstractBasisLayout, basis_axes, Inclusion, grammatrix, weaklaplacian, layout_broadcasted, laplacian, abslaplacian, laplacian_axis, abslaplacian_axis, diff_layout, operatororder, broadcastbasis, KronExpansionLayout +import ContinuumArrays: @simplify, Weight, weight, grid, plotgrid, TransformFactorization, ExpansionLayout, plotvalues, unweighted, plan_transform, checkpoints, transform_ldiv, AbstractBasisLayout, basis_axes, Inclusion, grammatrix, weaklaplacian, layout_broadcasted, laplacian, abslaplacian, laplacian_axis, abslaplacian_axis, diff_layout, operatororder, broadcastbasis, KronExpansionLayout, ApplyPlan import ArrayLayouts: MemoryLayout, sublayout, sub_materialize import BlockArrays: block, blockindex, BlockSlice, viewblock, blockcolsupport, AbstractBlockStyle, BlockStyle diff --git a/src/rect.jl b/src/rect.jl index 98e9c9b..64f981b 100644 --- a/src/rect.jl +++ b/src/rect.jl @@ -84,15 +84,6 @@ end grammatrix(P::KronPolynomial) = KronTrav(reverse(grammatrix.(P.args))...) -struct ApplyPlan{T, F, Pl} - f::F - plan::Pl -end - -ApplyPlan(f, P) = ApplyPlan{eltype(P), typeof(f), typeof(P)}(f, P) - -*(A::ApplyPlan, B::AbstractArray) = A.f(A.plan*B) - basis_axes(d::Inclusion{<:Any,<:ProductDomain}, v) = KronPolynomial(map(d -> basis(Inclusion(d)),components(d.domain))...) basis_axes(d::Inclusion{<:Any,<:DomainSets.FixedIntervalProduct{N,T,D}}, v) where {N,T,D} = KronPolynomial(Fill(basis(Inclusion(D())), N)) diff --git a/test/test_rect.jl b/test/test_rect.jl index 7e3d72d..c737a1b 100644 --- a/test/test_rect.jl +++ b/test/test_rect.jl @@ -301,7 +301,9 @@ Random.seed!(3242) x,y = coordinates(ChebyshevInterval()^2) A = [one(x) cos.(x) cos.(y)] - @test A[SVector(0.1,0.2),1] ≈ 1 + @test A[SVector(0.1,0.2),1] == 1 + @test A[SVector(0.1,0.2),2] == cos(0.1) + @test A[SVector(0.1,0.2),3] == cos(0.2) @test A[SVector(0.1,0.2),1:3] ≈ A[SVector(0.1,0.2),:] ≈ [1,cos(0.1),cos(0.2)] Q,R = qr(A)