Fix diagblockshift with cachedvector (Fixes bug in SingularIntegralEquations.jl) (#71)

Author: dlfivefifty

Project.toml

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

src/ApproxFunBase.jl

@@ -71,7 +71,7 @@ import BlockBandedMatrices: blockbandwidth, blockbandwidths, blockcolstop, block
                             isblockbanded, isbandedblockbanded, bb_numentries, BlockBandedSizes
 
 import FillArrays: AbstractFill, getindex_value
-import LazyArrays: cache
+import LazyArrays: cache, CachedVector, cacheddata
 import InfiniteArrays: PosInfinity, InfRanges, AbstractInfUnitRange, OneToInf, InfiniteCardinal
 
 

src/Caching/blockbanded.jl

@@ -62,9 +62,12 @@ function diagblockshift(a::Vcat{Int,1,<:Tuple{V1,<:AbstractFill{Int}}},
     return 1+diagblockshift(Vcat(a.args[1][2:end],a.args[2]),Vcat([b1-a1;b.args[1][2:end]],b.args[2]))
 end
 
+_cache2vcat(a) = Vcat(cacheddata(a), a.array)
+diagblockshift(a::CachedVector{Int,Vector{Int},<:AbstractFill}, b) = diagblockshift(_cache2vcat(a), b)
+diagblockshift(a, b::CachedVector{Int,Vector{Int},<:AbstractFill}) = diagblockshift(a, _cache2vcat(b))
+diagblockshift(a::CachedVector{Int,Vector{Int},<:AbstractFill}, b::CachedVector{Int,Vector{Int},<:AbstractFill}) = diagblockshift(_cache2vcat(a), _cache2vcat(b))
 
-diagblockshift(op::Operator) =
-    diagblockshift(blocklengths(domainspace(op)),blocklengths(rangespace(op)))
+diagblockshift(op::Operator) = diagblockshift(blocklengths(domainspace(op)),blocklengths(rangespace(op)))
 
 
 function CachedOperator(::Type{BlockBandedMatrix},op::Operator;padding::Bool=false)