LazyArrays v0.10 support

Author: dlfivefifty

Project.toml

@@ -30,15 +30,15 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 [compat]
 ApproxFun = "0.11"
 ApproxFunBase = "0.1"
-BandedMatrices = "0.9"
+BandedMatrices = "0.10"
 BlockArrays = "0.9"
 DomainSets = "0.0.2, 0.1"
 FastGaussQuadrature = "≥ 0.3.0"
 FastTransforms = "≥ 0.4.1"
 FillArrays = "≥ 0.5"
 InfiniteArrays = "0.1"
-LazyArrays = "0.8, 0.9"
+LazyArrays = "0.10"
 RecipesBase = "≥ 0.5.0"
 SpecialFunctions = "≥ 0.6.0"
 StaticArrays = "≥ 0.3.0"
-julia = "0.7, 1"
+julia = "1"

src/clenshaw.jl

@@ -47,12 +47,12 @@ function ClenshawRecurrenceData{T,S}(sp::S, N) where {T,S<:JacobiTriangle}
             Cx,Cy = view(Jx,Block(K-1,K)), view(Jy,Block(K-1,K))
             C[K-1] = BandedMatrix{T}(undef, (K-1,K+1), (0,2))
             B̃ˣ[K][end-1,end] = - inv(b₂) * By[K-1,K]/Bx[K-1,K-1]
-            C[K-1] .= Mul(Cx , B̃ˣ[K])
-            C[K-1] .= Mul(Cy, B̃ʸ[K]) .+ C[K-1]
+            C[K-1] .= @~ Cx *  B̃ˣ[K]
+            C[K-1] .= @~ Cy*B̃ʸ[K] + C[K-1]
         end
 
-        B[K] .= Mul(Ax, B̃ˣ[K])
-        B[K] .= Mul(Ay, B̃ʸ[K]) .+ B[K]
+        B[K] .= @~ Ax * B̃ˣ[K]
+        B[K] .= @~ Ay * B̃ʸ[K] + B[K]
     end
 
     ClenshawRecurrenceData{T,S}(sp, B̃ˣ, B̃ʸ, B, C)
@@ -161,9 +161,13 @@ function BandedBlockBandedMatrix(V::SubOperator{T,<:ClenshawMultiplication,Tuple
 
     Q = BandedBlockBandedMatrix(Eye{eltype(Jx)}(size(Jx)...), blocksizes(Jx), (0,0), (0,0))
     B2 = Fill(Q,N) .* view(cfs,Block(N))
-    B1 = Fill(Q,N-1) .* view(cfs,Block(N-1)) .+ Fill(Jx,N-1) .* (C.B̃ˣ[N-1]*B2) .+ Fill(Jy,N-1) .* (C.B̃ʸ[N-1]*B2) .- C.B[N-1]*B2
-    for K = N-2:-1:1
-        B1, B2 =  Fill(Q,K) .* view(cfs,Block(K)) .+ Fill(Jx,K) .* (C.B̃ˣ[K]*B1) .+ Fill(Jy,K) .* (C.B̃ʸ[K]*B1) .- C.B[K]*B1 .- C.C[K] * B2 ,  B1
+    if N == 1
+        B1 = B2
+    else
+        B1 = Fill(Q,N-1) .* view(cfs,Block(N-1)) .+ Fill(Jx,N-1) .* (C.B̃ˣ[N-1]*B2) .+ Fill(Jy,N-1) .* (C.B̃ʸ[N-1]*B2) .- C.B[N-1]*B2
+        for K = N-2:-1:1
+            B1, B2 =  Fill(Q,K) .* view(cfs,Block(K)) .+ Fill(Jx,K) .* (C.B̃ˣ[K]*B1) .+ Fill(Jy,K) .* (C.B̃ʸ[K]*B1) .- C.B[K]*B1 .- C.C[K] * B2 ,  B1
+        end
     end
 
 

test/runtests.jl

@@ -1,7 +1,7 @@
 using ApproxFun, MultivariateOrthogonalPolynomials, Test
 
-include("TriangleTest.jl")
-include("DirichletTriangleTest.jl")
+include("test_triangle.jl")
+include("test_dirichlettriangle.jl")
 
 
 ##  bessel

test/test_triangle.jl

@@ -1,9 +1,11 @@
 using StaticArrays, BandedMatrices, FastTransforms,
-        ApproxFun, MultivariateOrthogonalPolynomials, LinearAlgebra, Test
-    import MultivariateOrthogonalPolynomials: Lowering, DuffyTriangle,
-                            clenshaw, block, TriangleWeight,plan_evaluate, weight
-    import ApproxFun: testbandedblockbandedoperator, Block, BandedBlockBandedMatrix, blockcolrange, blocksize,
-                    Vec, jacobip, plan_transform
+        ApproxFunBase, ApproxFunOrthogonalPolynomials, ApproxFun, 
+        MultivariateOrthogonalPolynomials, LinearAlgebra, Test
+import MultivariateOrthogonalPolynomials: Lowering, DuffyTriangle,
+                        clenshaw, block, TriangleWeight,plan_evaluate, weight
+import ApproxFunBase: testbandedblockbandedoperator, Block, BandedBlockBandedMatrix, blockcolrange, blocksize,
+                Vec, plan_transform
+import ApproxFunOrthogonalPolynomials: jacobip                
 
 
 @testset "Triangle domain" begin
@@ -264,7 +266,6 @@ end
     testbandedblockbandedoperator(Δ)
 end
 
-
 @testset "Triangle derivatives" begin
     K=JacobiTriangle(0,0,0)
     f=Fun((x,y)->exp(x*cos(y)),K)