Skip to content

Commit cb87917

Browse files
committed
v0.1.5
1 parent 3d423e3 commit cb87917

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

Project.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "ApproxFunBase"
22
uuid = "fbd15aa5-315a-5a7d-a8a4-24992e37be05"
3-
version = "0.1.4"
3+
version = "0.1.5"
44

55
[deps]
66
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
@@ -25,8 +25,8 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
2525
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
2626
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
2727
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
28-
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
2928
ToeplitzMatrices = "c751599d-da0a-543b-9d20-d0a503d91d24"
29+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
3030

3131
[compat]
3232
AbstractFFTs = "0.4"
@@ -38,14 +38,14 @@ DSP = "0.5, 0.6"
3838
DomainSets = "0.1"
3939
DualNumbers = "0.6.2"
4040
FFTW = "0.3"
41-
FastGaussQuadrature = "0.3.2"
42-
FastTransforms = "0.5"
43-
FillArrays = "0.6"
44-
InfiniteArrays = "0.1"
41+
FastGaussQuadrature = "0.3.2, 0.4"
42+
FastTransforms = "0.5, 0.6"
43+
FillArrays = "0.6, 0.7"
44+
InfiniteArrays = "0.1, 0.2"
4545
IntervalSets = "0.3.1"
46-
LazyArrays = "0.8, 0.9, 0.10"
46+
LazyArrays = "0.8, 0.9, 0.10, 0.11"
4747
LowRankApprox = "0.2"
4848
SpecialFunctions = "0.7"
4949
StaticArrays = "0.9, 0.10, 0.11"
50-
ToeplitzMatrices = "0.5"
50+
ToeplitzMatrices = "0.5, 0.6"
5151
julia = "1.0"

src/Caching/blockbanded.jl

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,27 +39,27 @@ diagblockshift(a::AbstractFill{Int},b::Vcat{Int,1,<:Tuple{V1,<:AbstractFill{Int}
3939

4040

4141
function diagblockshift(a::Vcat{Int,1,<:Tuple{V1,<:AbstractFill{Int}}},b::AbstractFill{Int}) where V1 <: AbstractVector{Int}
42-
@assert getindex_value(a.arrays[end]) == getindex_value(b)
43-
isempty(a.arrays[1]) && return diagblockshift(a.arrays[2],b)
42+
@assert getindex_value(a.args[end]) == getindex_value(b)
43+
isempty(a.args[1]) && return diagblockshift(a.args[2],b)
4444
a1, b1 = a[1],b[1]
45-
a1 == b1 && return diagblockshift(Vcat(a.arrays[1][2:end],a.arrays[2]),b)
46-
a1 > b1 && length(a.arrays[1]) == 1 && return 0
47-
a1 > b1 && return max(0,-1+diagblockshift(flatten(([a1-b1;a.arrays[1][2:end]],a.arrays[2]),b)))
48-
a1 < b1 && length(a.arrays[1]) == 1 && return 1
45+
a1 == b1 && return diagblockshift(Vcat(a.args[1][2:end],a.args[2]),b)
46+
a1 > b1 && length(a.args[1]) == 1 && return 0
47+
a1 > b1 && return max(0,-1+diagblockshift(flatten(([a1-b1;a.args[1][2:end]],a.args[2]),b)))
48+
a1 < b1 && length(a.args[1]) == 1 && return 1
4949
# a1 < b1 &&
50-
return 1+diagblockshift(Vcat(a.arrays[1][2:end],a.arrays[2]),Vcat([b1-a1],b))
50+
return 1+diagblockshift(Vcat(a.args[1][2:end],a.args[2]),Vcat([b1-a1],b))
5151
end
5252

5353
function diagblockshift(a::Vcat{Int,1,<:Tuple{V1,<:AbstractFill{Int}}},
5454
b::Vcat{Int,1,<:Tuple{V2,<:AbstractFill{Int}}}) where {V1 <: AbstractVector{Int},V2 <: AbstractVector{Int}}
55-
isempty(a.arrays[1]) && return diagblockshift(a.arrays[2],b)
56-
isempty(b.arrays[1]) && return diagblockshift(a,b.arrays[2])
55+
isempty(a.args[1]) && return diagblockshift(a.args[2],b)
56+
isempty(b.args[1]) && return diagblockshift(a,b.args[2])
5757
a1, b1 = a[1],b[1]
58-
a1 == b1 && return diagblockshift(Vcat(a.arrays[1][2:end],a.arrays[2]),Vcat(b.arrays[1][2:end],b.arrays[2]))
59-
a1 > b1 && return max(0,-1+diagblockshift(Vcat([a1-b1;a.arrays[1][2:end]],a.arrays[2]),
60-
Vcat(b.arrays[1][2:end],b.arrays[2])))
58+
a1 == b1 && return diagblockshift(Vcat(a.args[1][2:end],a.args[2]),Vcat(b.args[1][2:end],b.args[2]))
59+
a1 > b1 && return max(0,-1+diagblockshift(Vcat([a1-b1;a.args[1][2:end]],a.args[2]),
60+
Vcat(b.args[1][2:end],b.args[2])))
6161
# a1 < b1 &&
62-
return 1+diagblockshift(Vcat(a.arrays[1][2:end],a.arrays[2]),Vcat([b1-a1;b.arrays[1][2:end]],b.arrays[2]))
62+
return 1+diagblockshift(Vcat(a.args[1][2:end],a.args[2]),Vcat([b1-a1;b.args[1][2:end]],b.args[2]))
6363
end
6464

6565

0 commit comments

Comments
 (0)