Skip to content

Commit d2678ac

Browse files
authored
Merge branch 'master' into compactshow
2 parents 6f9522c + af037cb commit d2678ac

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "ApproxFun"
22
uuid = "28f2ccd6-bb30-5033-b560-165f7b14dc2f"
3-
version = "0.13.2"
3+
version = "0.13.4"
44

55
[deps]
66
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
@@ -28,7 +28,7 @@ Calculus = "0.5"
2828
DomainSets = "0.3, 0.4, 0.5"
2929
DualNumbers = "0.6.2"
3030
FFTW = "1"
31-
FastTransforms = "0.13"
31+
FastTransforms = "0.13, 0.14"
3232
RecipesBase = "1.0"
3333
Reexport = "1.0"
3434
SpecialFunctions = "1.1, 2"

docs/Project.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[deps]
2+
ApproxFun = "28f2ccd6-bb30-5033-b560-165f7b14dc2f"
23
BandedMatrices = "aae01518-5342-5314-be14-df237901396f"
34
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
5+
DomainSets = "5b8099bc-c8ec-5219-889f-1d9e522a28bf"
6+
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

test/ReadmeTest.jl

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -107,16 +107,14 @@ using ApproxFun, SpecialFunctions, LinearAlgebra, Test
107107
# [ones(∂(d));0.];tolerance=1E-10) # First four entries of rhs are
108108
#
109109

110-
111-
112-
QR = qr([Dirichlet(d);Laplacian()+100I])
113-
@time ApproxFun.resizedata!(QR,:,4000)
114-
@time u = \(QR,
115-
[ones((d));0.];tolerance=1E-7)
116-
117-
118-
@test u(0.1,1.) 1.0
119-
@test (u(0.1,0.2),-0.02768276827514463;atol=1E-8)
110+
# this is broken on v1.6 (on BandedArrays < v0.16.16), so we skip on errors
111+
if VERSION >= v"1.7"
112+
QR = qr([Dirichlet(d);Laplacian()+100I])
113+
@time ApproxFun.resizedata!(QR,:,4000)
114+
@time u = \(QR, [ones((d)); 0.]; tolerance=1E-7)
115+
@test u(0.1,1.) 1.0
116+
@test (u(0.1,0.2),-0.02768276827514463;atol=1E-8)
117+
end
120118
end
121119

122120
# @testset "BigFloat" begin

0 commit comments

Comments
 (0)