Improve type inferrence of checkpoints, fix points for 1d x 2d

Author: dlfivefifty

src/Domains/ProductDomain.jl

@@ -19,15 +19,15 @@ function pushappendpts!(ret, xx, pts)
         push!(ret,Vec(xx...))
     else
         for x in pts[1]
-            pushappendpts!(ret,(xx...,x),pts[2:end])
+            pushappendpts!(ret,(xx...,x...),pts[2:end])
         end
     end
     ret
 end
 
 function checkpoints(d::ProductDomain)
-    pts=map(checkpoints,d.domains)
-    ret=Vector{Vec{length(d.domains),float(mapreduce(eltype,promote_type,d.domains))}}(undef, 0)
+    pts = checkpoints.(d.domains)
+    ret=Vector{Vec{sum(dimension.(d.domains)),float(promote_type(eltype.(eltype.(d.domains))...))}}(undef, 0)
 
     pushappendpts!(ret,(),pts)
     ret

src/Multivariate/TensorSpace.jl

@@ -246,7 +246,7 @@ TensorSpace(A::ProductDomain) = TensorSpace(tuple(map(Space,A.domains)...))
 ⊗(A::Space,B::TensorSpace) = TensorSpace(A,B.spaces...)
 ⊗(A::Space,B::Space) = TensorSpace(A,B)
 
-domain(f::TensorSpace) = mapreduce(domain,×,f.spaces)
+domain(f::TensorSpace) = ×(domain.(f.spaces)...)
 Space(sp::ProductDomain) = TensorSpace(sp)
 
 setdomain(sp::TensorSpace, d::ProductDomain) = TensorSpace(setdomain.(factors(sp), factors(d)))

src/Space.jl

@@ -98,6 +98,7 @@ isambiguous(sp::Space) = isambiguous(rangetype(sp))
 
 #TODO: should it default to canonicalspace?
 points(d::Space,n) = points(domain(d),n)
+points(d::Space) = points(d, dimension(d))
 
 
 

test/SpacesTest.jl

@@ -1,5 +1,5 @@
 using ApproxFunBase, Test
-import ApproxFunBase: PointSpace, HeavisideSpace, PiecewiseSegment
+import ApproxFunBase: PointSpace, HeavisideSpace, PiecewiseSegment, dimension, Vec, checkpoints
 
 @testset "Spaces" begin
     @testset "PointSpace" begin
@@ -34,6 +34,10 @@ import ApproxFunBase: PointSpace, HeavisideSpace, PiecewiseSegment
 
         S = HeavisideSpace([-1.0,0.0,1.0])
         @test Derivative(S) === Derivative(S,1)
+
+        a = HeavisideSpace(0:0.25:1)
+        @test dimension(a) == 4
+        @test @inferred(points(a)) == 0.125:0.25:0.875
     end
 
     @testset "DiracDelta integration and differentiation" begin
@@ -57,4 +61,22 @@ import ApproxFunBase: PointSpace, HeavisideSpace, PiecewiseSegment
         @test h(2) == 0.3+1im
         @test h(3) == 3.3+1im
     end
+
+    @testset "Multivariate" begin
+        a = HeavisideSpace(0:0.25:1)
+        @test @inferred(dimension(a^2)) == dimension(a)^2
+        @test @inferred(domain(a^2)) == domain(a)^2
+        @test @inferred(points(a^2)) == vec(Vec.(points(a), points(a)'))
+        @test  @inferred(checkpoints(a^2)) == vec(Vec.(checkpoints(a)', checkpoints(a)))
+        
+        aa2 = TensorSpace(a , a^2)
+        @test dimension(aa2) == dimension(a)^3
+        @test @inferred(domain(aa2)) == domain(a)^3
+        @test @inferred(points(aa2)) == vec(Vec.(points(a), points(a)', reshape(points(a), 1,1,4)))
+        @test  @inferred(checkpoints(aa2)) == vec(Vec.(reshape(checkpoints(a), 1,1,length(checkpoints(a))), checkpoints(a)', checkpoints(a)))
+
+        @test dimension(a^3) == dimension(a)^3
+        @test @inferred(domain(a^3)) == domain(a)^3
+        @test_broken @inferred(points(a^3)) == vec(Vec.(points(a), points(a)', reshape(points(a), 1,1,4)))
+    end
 end