Skip to content

Commit 2e533b2

Browse files
authored
Dl/newblockarrays (#25)
* Update Project.toml * tests pass * Update Project.toml * Update Project.toml * Update Project.toml
1 parent f1840c0 commit 2e533b2

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

Project.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "ApproxFunOrthogonalPolynomials"
22
uuid = "b70543e2-c0d9-56b8-a290-0d4d6d4de211"
3-
version = "0.3"
3+
version = "0.3.1"
44

55
[deps]
66
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
@@ -21,10 +21,10 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
2121

2222
[compat]
2323
AbstractFFTs = "0.5"
24-
ApproxFunBase = "0.2"
24+
ApproxFunBase = "0.2, 0.3"
2525
BandedMatrices = "0.14"
26-
BlockArrays = "0.10"
27-
BlockBandedMatrices = "0.6"
26+
BlockArrays = "0.10, 0.11"
27+
BlockBandedMatrices = "0.6, 0.7.1"
2828
DomainSets = "0.1"
2929
FFTW = "1.1"
3030
FastGaussQuadrature = "0.4"
@@ -36,9 +36,9 @@ SpecialFunctions = "0.8, 0.9"
3636
julia = "1.3"
3737

3838
[extras]
39-
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
40-
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
4139
LazyArrays = "5078a376-72f3-5289-bfd5-ec5146d43c02"
40+
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
41+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
4242

4343
[targets]
4444
test = ["Test","StaticArrays","LazyArrays"]

src/Spaces/Chebyshev/Chebyshev.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,10 +230,10 @@ transform(S::TensorSpace{<:Tuple{<:Chebyshev,<:Chebyshev}},v::AbstractVector,
230230
plan=plan_transform(S,v)) = plan*copy(v)
231231

232232
plan_itransform(S::TensorSpace{<:Tuple{<:Chebyshev,<:Chebyshev}},v::AbstractVector) =
233-
plan_ipaduatransform!(eltype(v),sum(1:nblocks(Fun(S,v))),Val{false})
233+
plan_ipaduatransform!(eltype(v),sum(1:Int(block(S,length(v)))),Val{false})
234234

235235
itransform(S::TensorSpace{<:Tuple{<:Chebyshev,<:Chebyshev}},v::AbstractVector,
236-
plan=plan_itransform(S,v)) = plan*pad(v,sum(1:nblocks(Fun(S,v))))
236+
plan=plan_itransform(S,v)) = plan*pad(v,sum(1:Int(block(S,length(v)))))
237237

238238

239239
#TODO: adaptive

test/OperatorTest.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import ApproxFunOrthogonalPolynomials: JacobiZ
3131
A=Conversion(Chebyshev(d),Ultraspherical(2,d))
3232
x = Fun()
3333
f=Fun(exp)
34-
@test AbstractMatrix(view(A.op, Block.(1:3), Block.(1:3))) isa BlockBandedMatrix
34+
@test AbstractMatrix(view(A.op, Block.(1:3), Block.(1:3))) isa BlockSkylineMatrix
3535
testbandedoperator(A)
3636

3737
@test norm(A\Fun(x.*f,rangespace(A))-(x.*f)) < 100eps()

test/PDETest.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using ApproxFunBase, ApproxFunOrthogonalPolynomials, LinearAlgebra, Test
2-
import ApproxFunBase: testbandedblockbandedoperator, testblockbandedoperator, testraggedbelowoperator, Block, ldiv_coefficients
2+
import ApproxFunBase: testbandedblockbandedoperator, testblockbandedoperator, testraggedbelowoperator, Block, ldiv_coefficients
33

44
@testset "PDE" begin
55
@testset "Rectangle Laplace/Poisson" begin

0 commit comments

Comments
 (0)