improve inference of Dirichlet (#110)

* improve inference of Dirichlet

* test for inference on julia v1.8+

* reduce inference tests on old versions

* tests for ArraySpace

* version bump to v0.5.7

Author: jishnub

Project.toml

@@ -1,6 +1,6 @@
 name = "ApproxFunOrthogonalPolynomials"
 uuid = "b70543e2-c0d9-56b8-a290-0d4d6d4de211"
-version = "0.5.6"
+version = "0.5.7"
 
 [deps]
 AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"

src/Spaces/PolynomialSpace.jl

@@ -1,5 +1,3 @@
-
-
 export PolynomialSpace, NormalizedPolynomialSpace
 
 ## Orthogonal polynomials

src/Spaces/Ultraspherical/ContinuousSpace.jl

@@ -228,7 +228,7 @@ end
 const TensorChebyshevDirichlet = TensorSpace{<:Tuple{<:ChebyshevDirichlet{1,1,<:IntervalOrSegment},
                                   <:ChebyshevDirichlet{1,1,<:IntervalOrSegment}}}
 
-Dirichlet(S::TensorChebyshevDirichlet,k) = k == 0 ? ConcreteDirichlet(S,0) : tensor_Dirichlet(S,k)
+@inline Dirichlet(S::TensorChebyshevDirichlet,k) = k == 0 ? ConcreteDirichlet(S,0) : tensor_Dirichlet(S,k)
 
 Dirichlet(d::RectDomain) =
     Dirichlet(ChebyshevDirichlet{1,1}(factor(d,1))*ChebyshevDirichlet{1,1}(factor(d,2)))

test/ChebyshevTest.jl

@@ -8,85 +8,80 @@ import ApproxFunOrthogonalPolynomials: forwardrecurrence
     end
 
     @testset "ChebyshevInterval" begin
-        @test Fun(x->2,10)(.1) ≈ 2
-        @test Fun(x->2)(.1) ≈ 2
-        @test Fun(Chebyshev,Float64[]).([0.,1.]) ≈ [0.,0.]
-        @test Fun(Chebyshev,[])(0.) ≈ 0.
-        @test Fun(x->4,Chebyshev(),1).coefficients == [4.0]
-        @test Fun(x->4).coefficients == [4.0]
-        @test Fun(4).coefficients == [4.0]
+        @test @inferred Fun(x->2,10)(.1) ≈ 2
+        @test @inferred Fun(x->2)(.1) ≈ 2
+        @test @inferred Fun(Chebyshev,Float64[]).([0.,1.]) ≈ [0.,0.]
+        @test @inferred Fun(Chebyshev,[])(0.) ≈ 0.
+        @test @inferred Fun(x->4,Chebyshev(),1).coefficients == [4.0]
+        @test @inferred Fun(x->4).coefficients == [4.0]
+        @test @inferred Fun(4).coefficients == [4.0]
 
 
-        @test Fun(x->4).coefficients == [4.0]
-        @test Fun(4).coefficients == [4.0]
+        @test @inferred Fun(x->4).coefficients == [4.0]
+        @test @inferred Fun(4).coefficients == [4.0]
 
-        f = Fun(ChebyshevInterval(), [1])
+        f = @inferred Fun(ChebyshevInterval(), [1])
         @test f(0.1) == 1
 
-        ef = Fun(exp)
-        @test ef(0.1) ≈ exp(0.1)
+        ef = if VERSION >= v"1.8"
+            @inferred Fun(exp)
+        else
+            Fun(exp)
+        end
+        @test @inferred ef(0.1) ≈ exp(0.1)
+        @test @inferred ef(.5) ≈ exp(.5)
 
         for d in (ChebyshevInterval(),Interval(1.,2.),Segment(1.0+im,2.0+2im))
             testspace(Chebyshev(d))
         end
 
-        ef = Fun(exp,ChebyshevInterval())
-
-        @test ef == -(-ef)
-        @test ef == (ef-1) + 1
-
-        ef = Fun(exp)
-
-        cf = Fun(cos)
-
-        ecf = Fun(x->cos(x).*exp(x))
-        eocf = Fun(x->cos(x)./exp(x))
-
-        @test ef(.5) ≈ exp(.5)
-        @test ecf(.123456) ≈ cos(.123456).*exp(.123456)
+        y = @inferred Fun() + Fun(ChebyshevInterval{BigFloat}())
+        @test y == 2Fun()
     end
 
     @testset "Algebra" begin
-        ef = Fun(exp,ChebyshevInterval())
-
-        @test ef == -(-ef)
+        ef = @inferred Fun(exp,ChebyshevInterval())
+        @test ef == @inferred -(-ef)
         @test ef == (ef-1) + 1
 
-        @test ef / 3 == (3 \ ef)
-
+        if VERSION >= v"1.8"
+            @test (@inferred ef / 3) == @inferred (3 \ ef)
+        else
+            @test ef / 3 == 3 \ ef
+        end
 
         cf = Fun(cos)
 
-        ecf = Fun(x->cos(x).*exp(x))
-        eocf = Fun(x->cos(x)./exp(x))
+        ecf = VERSION >= v"1.8" ? @inferred(Fun(x->cos(x)*exp(x))) : Fun(x->cos(x)*exp(x))
+        eocf = VERSION >= v"1.8" ? @inferred(Fun(x->cos(x)/exp(x))) : Fun(x->cos(x)/exp(x))
 
         @test ef(.5) ≈ exp(.5)
         @test ecf(.123456) ≈ cos(.123456).*exp(.123456)
 
         r=2 .* rand(100) .- 1
 
-        @test maximum(abs,ef.(r)-exp.(r))<200eps()
-        @test maximum(abs,ecf.(r).-cos.(r).*exp.(r))<200eps()
+        @test @inferred maximum(abs,ef.(r)-exp.(r))<200eps()
+        @test @inferred maximum(abs,ecf.(r).-cos.(r).*exp.(r))<200eps()
 
-        @test (cf .* ef)(0.1) ≈ ecf(0.1) ≈ cos(0.1)*exp(0.1)
-        @test domain(cf.*ef) ≈ domain(ecf)
-        @test domain(cf.*ef) == domain(ecf)
+        @test (@inferred (cf .* ef)(0.1)) ≈ ecf(0.1) ≈ cos(0.1)*exp(0.1)
+        @test (@inferred domain(cf.*ef)) ≈ domain(ecf)
+        @test (@inferred domain(cf.*ef)) == domain(ecf)
 
-        @test norm((ecf-cf.*ef).coefficients)<200eps()
-        @test maximum(abs,(eocf-cf./ef).coefficients)<1000eps()
+        @test norm(@inferred(ecf-cf.*ef).coefficients)<200eps()
+        @test maximum(abs,@inferred((eocf-cf./ef)).coefficients)<1000eps()
         @test norm(((ef/3).*(3/ef)-1).coefficients)<1000eps()
     end
 
     @testset "Diff and cumsum" begin
         ef = Fun(exp)
         cf = Fun(cos)
-        @test norm((ef - ef').coefficients)<10E-11
+        @test norm(@inferred(ef - ef').coefficients)<10E-11
 
-        @test norm((ef - cumsum(ef)').coefficients) < 20eps()
-        @test norm((cf - cumsum(cf)').coefficients) < 20eps()
+        @test norm(@inferred(ef - cumsum(ef)').coefficients) < 20eps()
+        @test norm(@inferred(cf - cumsum(cf)').coefficients) < 20eps()
 
-        @test sum(ef)  ≈ 2.3504023872876028
-        @test norm(ef)  ≈ 1.90443178083307
+        @test @inferred(sum(ef))  ≈ 2.3504023872876028
+        @test @inferred(norm(ef))  ≈ 1.90443178083307
     end
 
     @testset "other domains" begin

test/MultivariateTest.jl

@@ -273,10 +273,9 @@ end
         @test g(0.1,1) ≈ 0
     end
 
-
     @testset "Dirichlet" begin
-        testblockbandedoperator(Dirichlet((0..1)^2))
-        testblockbandedoperator(Dirichlet((0..1) × (0.0 .. 1)))
+        testblockbandedoperator(@inferred Dirichlet((0..1)^2))
+        testblockbandedoperator(@inferred Dirichlet((0..1) × (0.0 .. 1)))
         testraggedbelowoperator(Dirichlet(Chebyshev()^2))
         testraggedbelowoperator(Dirichlet(Chebyshev(0..1) * Chebyshev(0.0..1)))
     end

test/miscAFBase.jl

@@ -227,4 +227,11 @@ using ApproxFunBase
         @test a[1] == 1
         @test a[2] ≈ exp(1)
     end
+
+    @testset "ArraySpace" begin
+        f = Fun(x->[cos(x), exp(x)], -1..1)
+        for x in [-1,0,1]
+            @test (f + one(f))(x) ≈ f(x) .+ one.(f(x))
+        end
+    end
 end