Support LazyArrays v2.0 and BlockArrays v1.0 (#81)

* Support LazyArrays v2.0 and BlockArrays v1.0

* PseudoBlock -> Blocked

Author: dlfivefifty

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.9'
+          - '1.10'
         os:
           - ubuntu-latest
           - macOS-latest

Project.toml

@@ -1,7 +1,7 @@
 name = "HarmonicOrthogonalPolynomials"
 uuid = "e416a80e-9640-42f3-8df8-80a93ca01ea5"
 authors = ["Sheehan Olver <solver@mac.com>"]
-version = "0.5.4"
+version = "0.6"
 
 [deps]
 BlockArrays = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
@@ -18,18 +18,18 @@ SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 
 [compat]
-BlockArrays = "0.16"
-BlockBandedMatrices = "0.12"
-ClassicalOrthogonalPolynomials = "0.12"
-ContinuumArrays = "0.17"
+BlockArrays = "1.0"
+BlockBandedMatrices = "0.13"
+ClassicalOrthogonalPolynomials = "0.13"
+ContinuumArrays = "0.18"
 DomainSets = "0.7"
 FastTransforms = "0.15, 0.16"
-InfiniteArrays = "0.13.8"
+InfiniteArrays = "0.14"
 IntervalSets = "0.7"
 QuasiArrays = "0.11"
 SpecialFunctions = "1, 2"
 StaticArrays = "1"
-julia = "1.9"
+julia = "1.10"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

README.md

@@ -39,7 +39,7 @@ Inclusion(the 3-dimensional unit sphere)
 julia> f = 𝐱 -> ((x,y,z) = 𝐱; exp(x)*cos(y*sin(z))); # function to be approximation
 
 julia> S \ f.(𝐱) # expansion coefficients, adaptively computed
-∞-blocked ∞-element PseudoBlockArray{Complex{Float64},1,LazyArrays.CachedArray{Complex{Float64},1,Array{Complex{Float64},1},Zeros{Complex{Float64},1,Tuple{InfiniteArrays.OneToInf{Int64}}}},Tuple{BlockedUnitRange{ArrayLayouts.RangeCumsum{Int64,InfiniteArrays.InfStepRange{Int64,Int64}}}}}:
+∞-blocked ∞-element BlockedArray{Complex{Float64},1,LazyArrays.CachedArray{Complex{Float64},1,Array{Complex{Float64},1},Zeros{Complex{Float64},1,Tuple{InfiniteArrays.OneToInf{Int64}}}},Tuple{BlockedOneTo{Int,ArrayLayouts.RangeCumsum{Int64,InfiniteArrays.InfStepRange{Int64,Int64}}}}}:
         4.05681442931116 + 0.0im                   
  ──────────────────────────────────────────────────
       1.5777291816142751 + 3.19754060061646e-16im  

src/HarmonicOrthogonalPolynomials.jl

@@ -21,7 +21,7 @@ include("spheretrav.jl")
 include("coordinates.jl")
 
 # roughly try to double the computational time each iteration
-increasingtruncations(::BlockedUnitRange{<:RangeCumsum{Int,<:AbstractRange}}) = broadcast(n -> Block.(oneto((2^(n ÷ 2)) ÷ 2)), 4:2:∞)
+increasingtruncations(::BlockedOneTo{Int,<:RangeCumsum{Int,<:AbstractRange}}) = broadcast(n -> Block.(oneto((2^(n ÷ 2)) ÷ 2)), 4:2:∞)
 
 
 checkpoints(::UnitSphere{T}) where T = [SphericalCoordinate{T}(0.1,0.2), SphericalCoordinate{T}(0.3,0.4)]
@@ -131,7 +131,7 @@ plan_transform(P::MultivariateOrthogonalPolynomial, Bs::NTuple{N,Int}, dims=ntup
 
 function _sum(A::AbstractSphericalHarmonic{T}, dims) where T
     @assert dims == 1
-    PseudoBlockArray(Hcat(sqrt(4convert(T, π)), Zeros{T}(1,∞)), (Base.OneTo(1),axes(A,2)))
+    BlockedArray(Hcat(sqrt(4convert(T, π)), Zeros{T}(1,∞)), (Base.OneTo(1),axes(A,2)))
 end
 
 include("laplace.jl")

src/angularmomentum.jl

@@ -34,7 +34,7 @@ end
     n = mortar(Fill.(oneto(∞),1:2:∞))
     k = mortar(Base.OneTo.(0:2:∞))
     m = T.(iseven.(k) .* (k .÷ 2))
-    dat = PseudoBlockArray(Vcat(
+    dat = BlockedArray(Vcat(
         (-m)', # n, k-1
         (0 .* m)', # n, k
         (m)', # n, k+1

src/multivariateops.jl

@@ -85,7 +85,7 @@ where A[N] is (N+1) x 2N, B[N] and C[N] are (N+1) x N.
 
 
 # forwardrecurrence(N::Block{1}, A::AbstractVector, B::AbstractVector, C::AbstractVector, xy) =
-#     forwardrecurrence!(PseudoBlockVector{promote_type(eltype(eltype(A)),eltype(eltype(B)),eltype(eltype(C)),eltype(xy))}(undef, 1:Int(N)), A, B, C, xy)
+#     forwardrecurrence!(BlockedVector{promote_type(eltype(eltype(A)),eltype(eltype(B)),eltype(eltype(C)),eltype(xy))}(undef, 1:Int(N)), A, B, C, xy)
 
 # use block expansion
 ContinuumArrays.transform_ldiv(V::SubQuasiArray{<:Any,2,<:MultivariateOrthogonalPolynomial,<:Tuple{Inclusion,BlockSlice{BlockOneTo}}}, B::AbstractQuasiArray, _) =
@@ -103,7 +103,7 @@ ContinuumArrays._sub_factorize(::Tuple{Any,Any}, (kr,jr)::Tuple{Any,BlockSlice{B
 
 # Make sure block structure matches. Probably should do this for all block mul
 QuasiArrays.mul(A::MultivariateOrthogonalPolynomial, b::AbstractVector) =
-    ApplyQuasiArray(*, A, PseudoBlockVector(b, (axes(A,2),)))
+    ApplyQuasiArray(*, A, BlockedVector(b, (axes(A,2),)))
 
 
 # plotting