Fix JacobiWeight constructor for PiecewiseSpace (#66)

* don't branch in maxspace_rule

* fix sumspace hasconversion, PiecewiseSpace

Fix the constructor for PiecewiseSpace. Also revert the branch removal

Author: jishnub

src/JacobiWeight.jl

@@ -34,7 +34,7 @@ JacobiWeight(a::Number, b::Number, d::IntervalOrSegment) = JacobiWeight(a,b,Spac
 JacobiWeight(a::Number, b::Number, d) = JacobiWeight(a,b,Space(d))
 JacobiWeight(a::Number, b::Number) = JacobiWeight(a,b,Chebyshev())
 
-JacobiWeight(a::Number, b::Number,s::PiecewiseSpace) = PiecewiseSpace(JacobiWeight(a,b,components(s)))
+JacobiWeight(a::Number, b::Number,s::PiecewiseSpace) = PiecewiseSpace(JacobiWeight.(a,b,components(s)))
 
 """
     WeightedJacobi(β, α, d::Domain = ChebyshevInterval())

src/JacobiWeightOperators.jl

@@ -245,20 +245,22 @@ end
 #     MultiplicationWrapper(f,SpaceOperator(M,dsp,S))
 # end
 
+function _maxspace_rule(A::JacobiWeight, B::JacobiWeight, f)
+    if domainscompatible(A,B) && isapproxinteger(A.β-B.β) && isapproxinteger(A.α-B.α)
+        ms = f(A.space,B.space)
+        if min(A.β,B.β) == 0 && min(A.α,B.α) == 0
+            return ms
+        else
+            return JacobiWeight(min(A.β,B.β),min(A.α,B.α),ms)
+        end
+    end
+    NoSpace()
+end
+
 ## Conversion
 for (OPrule,OP) in ((:maxspace_rule,:maxspace),(:union_rule,:union))
     @eval begin
-        function $OPrule(A::JacobiWeight, B::JacobiWeight)
-            if domainscompatible(A,B) && isapproxinteger(A.β-B.β) && isapproxinteger(A.α-B.α)
-                ms=$OP(A.space,B.space)
-                if min(A.β,B.β) == 0 && min(A.α,B.α) == 0
-                    return ms
-                else
-                    return JacobiWeight(min(A.β,B.β),min(A.α,B.α),ms)
-                end
-            end
-            NoSpace()
-        end
+        $OPrule(A::JacobiWeight, B::JacobiWeight) = _maxspace_rule(A, B, $OP)
         $OPrule(A::JacobiWeight, B::Space{<:IntervalOrSegmentDomain}) = $OPrule(A,JacobiWeight(0,0,B))
     end
 end
@@ -274,6 +276,8 @@ for FUNC in (:hasconversion,:isconvertible)
             $FUNC(A,JacobiWeight(0,0,B))
         $FUNC(B::Space{D},A::JacobiWeight{<:Any,D}) where {D<:IntervalOrSegmentDomain} =
             $FUNC(JacobiWeight(0,0,B),A)
+        $FUNC(A::SumSpace{<:Any,D},B::JacobiWeight{<:Any,D}) where {D<:IntervalOrSegmentDomain} =
+            all(s -> $FUNC(s, B), A.spaces)
     end
 end
 

test/runtests.jl

@@ -3,7 +3,7 @@ module AFSTests
 using ApproxFunBase
 using ApproxFunBase: HeavisideSpace, PointSpace, ArraySpace, DiracSpace, PiecewiseSegment,
                         UnionDomain, resizedata!, CachedOperator, RaggedMatrix,
-                        Block, ∞, BandedBlockBandedMatrix
+                        Block, ∞, BandedBlockBandedMatrix, NoSpace
 using ApproxFunBaseTest: testbandedoperator, testtransforms, testfunctional,
                         testbandedblockbandedoperator
 using ApproxFunOrthogonalPolynomials
@@ -194,11 +194,23 @@ end
         @test order(s) == order(us)
     end
 
+    @testset "PiecewiseSpace" begin
+        ps = PiecewiseSpace((Chebyshev(0..1),Chebyshev(1..2)))
+        jps = JacobiWeight(0,0,ps)
+        @test domain(jps) == domain(ps)
+    end
+
     @testset "inference in maxspace" begin
         sp = JacobiWeight(half(Odd(1)), half(Odd(1)), Legendre())
         @test (@inferred maxspace(sp, sp)) == sp
 
-        @test (@inferred maxspace(sp, Legendre())) == ApproxFunBase.NoSpace()
+        sp2 = JacobiWeight(half(Odd(1)), half(Odd(1)), Legendre(0..1))
+        @test maxspace(sp, sp2) == NoSpace()
+
+        @test (@inferred maxspace(sp, Legendre())) == NoSpace()
+
+        sp = JacobiWeight(0.5,1,Legendre())
+        @test (@inferred Union{typeof(sp),NoSpace} ApproxFunBase.maxspace_rule(sp, sp)) == sp
     end
 end
 
@@ -415,6 +427,10 @@ end
         @test w(0.2im) ≈ 2/(sqrt(1-0.2im)*sqrt(1+im*(0.2im)))
         @test w(0.2) ≈ 2/(sqrt(1-0.2)*sqrt(1+im*(0.2)))
     end
+
+    @testset "hasconversion" begin
+        @test ApproxFunBase.hasconversion(Legendre() + Legendre(), JacobiWeight(0,0,Legendre()))
+    end
 end
 
 @testset "WeightedJacobi" begin