Use Block{1} in blockcol/rowsupport (#95)

* Use Block{1} in blockcol/rowsupport

* interlace blockcolrange

Author: dlfivefifty

Project.toml

@@ -1,6 +1,6 @@
 name = "ApproxFunBase"
 uuid = "fbd15aa5-315a-5a7d-a8a4-24992e37be05"
-version = "0.5.5"
+version = "0.5.6"
 
 [deps]
 AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"

src/Caching/blockbanded.jl

@@ -6,7 +6,7 @@
 function default_BlockBandedMatrix(S::Operator)
     ret = BlockBandedMatrix(Zeros, S)
 
-    @inbounds for J=blockaxes(ret,2), K=blockcolrange(ret,Int(J))
+    @inbounds for J=blockaxes(ret,2), K=blockcolrange(ret,J)
         ret[K,J] = view(S,K,J)
     end
     ret

src/Operators/Operator.jl

@@ -245,13 +245,13 @@ defaultgetindex(A::Operator,k,j) = view(A,k,j)
 
 
 # TODO: finite dimensional blocks
-blockcolstart(A::Operator,J::Integer) = Block(max(1,J-blockbandwidth(A,2)))
-blockrowstart(A::Operator,K::Integer) = Block(max(1,K-blockbandwidth(A,1)))
-blockcolstop(A::Operator,J::Integer) = Block(min(J+blockbandwidth(A,1),blocksize(A,1)))
-blockrowstop(A::Operator,K::Integer) = Block(min(K+blockbandwidth(A,2),blocksize(A,2)))
+blockcolstart(A::Operator, J::Block{1}) = Block(max(1,Int(J)-blockbandwidth(A,2)))
+blockrowstart(A::Operator, K::Block{1}) = Block(max(1,Int(K)-blockbandwidth(A,1)))
+blockcolstop(A::Operator, J::Block{1}) = Block(min(Int(J)+blockbandwidth(A,1),blocksize(A,1)))
+blockrowstop(A::Operator, K::Block{1}) = Block(min(Int(K)+blockbandwidth(A,2),blocksize(A,2)))
 
-blockrows(A::Operator,K::Integer) = blockrange(rangespace(A),K)
-blockcols(A::Operator,J::Integer) = blockrange(domainspace(A),J)
+blockrows(A::Operator, K::Block{1}) = blockrange(rangespace(A),K)
+blockcols(A::Operator, J::Block{1}) = blockrange(domainspace(A),J)
 
 
 # default is to use bandwidth

src/Operators/general/InterlaceOperator.jl

@@ -398,7 +398,7 @@ function blockbanded_interlace_convert!(S,ret)
                 BlockBandedMatrix(view(op, KR_size, JR_size))
             end, parent(S).ops)
 
-    for J=blockaxes(ret,2),K=blockcolrange(ret,Int(J))
+    for J=blockaxes(ret,2),K=blockcolrange(ret,J)
         Bs=view(ret,K,J)
         j = 0
         for ξ=1:size(M,2)

src/testing.jl

@@ -220,8 +220,8 @@ function testblockbandedoperator(A)
 
     if -blockbandwidth(A,1) ≤ blockbandwidth(A,2)
         for K=1:10
-            @test K - blockbandwidth(A,2) ≤ blockcolstop(A,K).n[1] ≤ K + blockbandwidth(A,1) < ∞
-            @test K - blockbandwidth(A,1) ≤ blockrowstop(A,K).n[1] ≤ K + blockbandwidth(A,2) < ∞
+            @test K - blockbandwidth(A,2) ≤ blockcolstop(A,Block(K)).n[1] ≤ K + blockbandwidth(A,1) < ∞
+            @test K - blockbandwidth(A,1) ≤ blockrowstop(A,Block(K)).n[1] ≤ K + blockbandwidth(A,2) < ∞
         end
     end
 end