Add tests for trivialtensorizer blocks (#357)

Author: jishnub

src/LinearAlgebra/helper.jl

@@ -712,8 +712,9 @@ Base.length(b::BlockInterlacer) = mapreduce(sum,+,b.blocks)
 
 # are all Ints, so finite dimensional
 function done(it::BlockInterlacer,st)
-    for k=1:length(it.blocks)
-        if st[end][k] < sum(it.blocks[k])
+    lngs = st[end]
+    for (k, (itk, lk)) in enumerate(zip(it.blocks, lngs))
+        if lk < sum(itk)
             return false
         end
     end
@@ -729,10 +730,10 @@ function iterate(it::BlockInterlacer, (N,k,blkst,lngs))
 
     if N > length(it.blocks)
         # increment to next block
-        blkst = map(function(blit,blst)
+        blkst = map(it.blocks,blkst) do blit,blst
                 xblst = iterate(blit, blst...)
                 xblst == nothing ? blst : (xblst[2],)
-            end,it.blocks,blkst)
+            end
         return iterate(it,(1,1,blkst,lngs))
     end
 

test/runtests.jl

@@ -478,19 +478,33 @@ end
 
 @testset "Tensorizer" begin
     @testset "TrivialTensorizer" begin
-        ax = Ones{Int}(∞)
-        t = ApproxFunBase.Tensorizer((ax,ax))
-        v = collect(Iterators.take(t, 15))
-        @test eltype(v) == eltype(t)
-        @testset for (i, vi) in enumerate(v)
-            @test vi == t[i]
-            @test findfirst(t, vi) == i
+        @testset "2D" begin
+            ax = Ones{Int}(∞)
+            t = ApproxFunBase.Tensorizer((ax,ax))
+            v = collect(Iterators.take(t, 150))
+            @test eltype(v) == eltype(t)
+            @testset for (i, vi) in enumerate(v)
+                blk = ApproxFunBase.block(t, i)
+                @test i ∈ ApproxFunBase.blockrange(t, blk)
+                @test vi == t[i]
+                @test findfirst(t, vi) == i
+            end
+        end
+        @testset "nD" begin
+            ax = Ones{Int}(∞)
+            t = ApproxFunBase.Tensorizer((ax,ax,ax))
+            v = collect(Iterators.take(t, 150))
+            @test eltype(v) == eltype(t)
+            @testset for i in eachindex(v)
+                blk = ApproxFunBase.block(t, i)
+                @test i ∈ ApproxFunBase.blockrange(t, blk)
+            end
         end
     end
     @testset "Tensorizer2D" begin
         ax = Ones{Int}(4)
         t = ApproxFunBase.Tensorizer((ax,ax))
-        v = collect(Iterators.take(t, 15))
+        v = collect(Iterators.take(t, 16))
         @test eltype(v) == eltype(t)
         @testset for (i, vi) in enumerate(v)
             @test findfirst(t, vi) == i