ContinuumArrays v0.17 (#77)

* ContinuumArrays v0.17

* fixes

* Update runtests.jl

Author: dlfivefifty

Project.toml

@@ -1,7 +1,7 @@
 name = "HarmonicOrthogonalPolynomials"
 uuid = "e416a80e-9640-42f3-8df8-80a93ca01ea5"
 authors = ["Sheehan Olver <solver@mac.com>"]
-version = "0.5.2"
+version = "0.5.3"
 
 [deps]
 BlockArrays = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
@@ -19,13 +19,13 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 
 [compat]
 BlockArrays = "0.16"
-BlockBandedMatrices = "0.11, 0.12"
-ClassicalOrthogonalPolynomials = "0.11"
-ContinuumArrays = "0.15, 0.16"
-DomainSets = "0.6, 0.7"
-FastTransforms = "0.14, 0.15"
-InfiniteArrays = "0.12, 0.13"
-IntervalSets = "0.5, 0.6, 0.7"
+BlockBandedMatrices = "0.12"
+ClassicalOrthogonalPolynomials = "0.12"
+ContinuumArrays = "0.17"
+DomainSets = "0.7"
+FastTransforms = "0.15"
+InfiniteArrays = "0.13"
+IntervalSets = "0.7"
 QuasiArrays = "0.11"
 SpecialFunctions = "1, 2"
 StaticArrays = "1"

src/HarmonicOrthogonalPolynomials.jl

@@ -6,7 +6,7 @@ import BlockArrays: block, blockindex, unblock, BlockSlice
 import DomainSets: indomain, Sphere
 import LinearAlgebra: norm, factorize
 import QuasiArrays: to_quasi_index, SubQuasiArray, *
-import ContinuumArrays: TransformFactorization, @simplify, ProjectionFactorization, plan_grid_transform, grid, grid_layout, plotgrid_layout, AbstractBasisLayout, MemoryLayout
+import ContinuumArrays: TransformFactorization, @simplify, ProjectionFactorization, plan_grid_transform, plan_transform, grid, grid_layout, plotgrid_layout, AbstractBasisLayout, MemoryLayout
 import ClassicalOrthogonalPolynomials: checkpoints, _sum, cardinality, increasingtruncations
 import BlockBandedMatrices: BlockRange1, _BandedBlockBandedMatrix
 import FastTransforms: Plan, interlace
@@ -123,19 +123,11 @@ RealSphericalHarmonicTransform{T}(N::Int) where T<:Real = RealSphericalHarmonicT
 
 
 
-function plan_grid_transform(P::SphericalHarmonic, szs::Tuple{Block{1}}, dims=1:1)
-    T = eltype(P)
-    B = szs[1]
-    grid(P, B), SphericalHarmonicTransform{T}(Int(B))
-end
-function plan_grid_transform(P::RealSphericalHarmonic, szs::Tuple{Block{1}}, dims=1:1)
-    T = eltype(P)
-    B = szs[1]
-    grid(P, B), RealSphericalHarmonicTransform{T}(Int(B))
-end
+plan_transform(P::SphericalHarmonic{T}, (N,)::Tuple{Block{1}}, dims=1) where T = SphericalHarmonicTransform{T}(Int(N))
+plan_transform(P::RealSphericalHarmonic{T}, (N,)::Tuple{Block{1}}, dims=1) where T = RealSphericalHarmonicTransform{T}(Int(N))
 
-plan_grid_transform(P::MultivariateOrthogonalPolynomial, Bs::NTuple{N,Int}, dims=1:N) where N =
-    plan_grid_transform(P, findblock.(Ref(axes(P,2)), Bs), dims)
+grid(P::MultivariateOrthogonalPolynomial, n::Int) = grid(P, findblock(axes(P,2),n))
+plan_transform(P::MultivariateOrthogonalPolynomial, Bs::NTuple{N,Int}, dims=ntuple(identity,Val(N))) where N = plan_transform(P, findblock.(Ref(axes(P,2)), Bs), dims)
 
 function _sum(A::AbstractSphericalHarmonic{T}, dims) where T
     @assert dims == 1

src/multivariateops.jl

@@ -92,7 +92,7 @@ ContinuumArrays.transform_ldiv(V::SubQuasiArray{<:Any,2,<:MultivariateOrthogonal
     factorize(V) \ B
 
 ContinuumArrays._sub_factorize(::Tuple{Any,Any}, (kr,jr)::Tuple{Any,BlockSlice{BlockRange1{OneTo{Int}}}}, L, dims...; kws...) =
-    TransformFactorization(plan_grid_transform(parent(L), PseudoBlockArray{eltype(L)}(undef, (jr.indices, oneto.(dims)...)), 1)...)
+    TransformFactorization(plan_grid_transform(parent(L), (last(jr.block), dims...), 1)...)
 
 # function factorize(V::SubQuasiArray{<:Any,2,<:MultivariateOrthogonalPolynomial,<:Tuple{Inclusion,AbstractVector{Int}}})
 #     P = parent(V)

test/runtests.jl

@@ -125,10 +125,15 @@ end
         @test c == S \ (xyz -> 1).(xyz)
         @test (S * c)[SphericalCoordinate(0.1,0.2)] ≈ 1
 
-        f = c -> ((x,y,z) = c; 1 + x + y + z)
-        u = S * (S \ f.(xyz))
+        f = (x,y,z) -> 1 + x + y + z
+        c = S \ splat(f).(xyz)
+        u = S * c
         p = SphericalCoordinate(0.1,0.2)
         @test u[p] ≈ 1+sum(p)
+
+        x = grid(SphericalHarmonic(), 5)
+        P = plan_transform(SphericalHarmonic(), 5)
+        @test P * splat(f).(x) ≈ [c; zeros(5)]
     end
 
     @testset "adaptive" begin