diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 495b153f5..550c1b235 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -23,7 +23,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - julia-version: [1] + julia-version: [1.12] os: [ubuntu-latest] steps: - uses: actions/checkout@v6 diff --git a/Project.toml b/Project.toml index 964213dc8..607251b3e 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "ApproxFun" uuid = "28f2ccd6-bb30-5033-b560-165f7b14dc2f" -version = "0.13.28" +version = "0.13.29" [deps] AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c" @@ -26,7 +26,7 @@ ApproxFunDualNumbersExt = "DualNumbers" [compat] AbstractFFTs = "1.0" -ApproxFunBase = "0.8.67, 0.9.28" +ApproxFunBase = "0.9.35" ApproxFunFourier = "0.3" ApproxFunOrthogonalPolynomials = "0.5, 0.6" ApproxFunSingularities = "0.3.10" @@ -35,7 +35,7 @@ BandedMatrices = "0.16, 0.17, 1" BlockBandedMatrices = "0.11, 0.12, 0.13" Calculus = "0.5" Documenter = "0.27, 1" -DomainSets = "0.3, 0.4, 0.5, 0.6, 0.7" +DomainSets = "0.3, 0.4, 0.5, 0.6, 0.7, 0.8" DualNumbers = "0.6.2" FFTW = "1" FastTransforms = "0.13, 0.14, 0.15, 0.16, 0.17" diff --git a/docs/Project.toml b/docs/Project.toml index a0a756d2d..fbcf5be4f 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -1,5 +1,6 @@ [deps] ApproxFun = "28f2ccd6-bb30-5033-b560-165f7b14dc2f" +ApproxFunBase = "fbd15aa5-315a-5a7d-a8a4-24992e37be05" BandedMatrices = "aae01518-5342-5314-be14-df237901396f" Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" DomainSets = "5b8099bc-c8ec-5219-889f-1d9e522a28bf" @@ -12,10 +13,11 @@ SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b" ApproxFun = {path = ".."} [compat] +ApproxFunBase = "0.9.35" BandedMatrices = "0.17, 1" Documenter = "1" -DomainSets = "0.6, 0.7" +DomainSets = "0.6, 0.7, 0.8" Literate = "2" Plots = "1" SpecialFunctions = "2" -julia = "1.6" +julia = "1.10" diff --git a/docs/make.jl b/docs/make.jl index c2f9ac038..eaefb34a1 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -1,6 +1,6 @@ using Documenter using Literate -using ApproxFun, DomainSets, LinearAlgebra, BandedMatrices # these packages are needed for the docs library +using ApproxFun, DomainSets, LinearAlgebra, BandedMatrices, ApproxFunBase # these packages are needed for the docs library # Generate examples using Literate # See https://github.com/fredrikekre/Literate.jl/blob/master/docs/make.jl diff --git a/examples/PDE_Heat.jl b/examples/PDE_Heat.jl index 107f57111..29797d4f3 100644 --- a/examples/PDE_Heat.jl +++ b/examples/PDE_Heat.jl @@ -9,13 +9,14 @@ # ``u(x,0) = u_0(x)``, where we choose ``u_0(x)`` to be a sharp Gaussian. using ApproxFun +using ApproxFunBase: cartesianproduct using LinearAlgebra dx = -1..1; dt = 0..1; # We construct a 2D domain that is the tensor product of x and t -d = dx × dt; +d = cartesianproduct(dx, dt); # The initial condition u0 = Fun(x->exp(-x^2/(2*0.2^2)), dx); diff --git a/test/BugInMultiplicationTest.jl b/test/BugInMultiplicationTest.jl index 5d134f911..e5feba676 100644 --- a/test/BugInMultiplicationTest.jl +++ b/test/BugInMultiplicationTest.jl @@ -1,9 +1,10 @@ using Test using ApproxFun using ApproxFunBase +using ApproxFunBase: cartesianproduct @testset "Bug in Multiplication" begin - dom = Interval(0.001, 1) × PeriodicSegment(-pi, pi) + dom = cartesianproduct(Interval(0.001, 1), PeriodicSegment(-pi, pi)) @test blocklengths(Space(dom)) == 2:2:∞ r,r2 = Fun((r,t) -> [r;r^2], dom) @test r(0.1,0.2) ≈ 0.1 diff --git a/test/LaplaceInAStripTest.jl b/test/LaplaceInAStripTest.jl index 1609b6344..9417397bf 100644 --- a/test/LaplaceInAStripTest.jl +++ b/test/LaplaceInAStripTest.jl @@ -1,8 +1,9 @@ using Test using ApproxFun +using ApproxFunBase: cartesianproduct @testset "Laplace in a strip" begin - d = PeriodicSegment() × ChebyshevInterval() + d = cartesianproduct(PeriodicSegment(), ChebyshevInterval()) g=Fun((x,y)->real(cos(x+im*y)),∂(d)) @test g(0.1,1.0) ≈ real(cos(0.1+im)) @test g(0.1,-1.0) ≈ real(cos(0.1-im)) diff --git a/test/PeriodicXIntervalTest.jl b/test/PeriodicXIntervalTest.jl index 540b48373..28c064ace 100644 --- a/test/PeriodicXIntervalTest.jl +++ b/test/PeriodicXIntervalTest.jl @@ -3,11 +3,12 @@ using ApproxFun using Random using LinearAlgebra using ApproxFunBase +using ApproxFunBase: cartesianproduct @testset "periodic x interval" begin dθ=PeriodicSegment(-2.,2.) dt=Interval(0,1.) - d=dθ×dt + d=cartesianproduct(dθ, dt) Dθ=Derivative(d,[1,0]) Dt=Derivative(d,[0,1]) u0=Fun(θ->exp(-20θ^2), dθ) @@ -19,7 +20,7 @@ using ApproxFunBase u=\([I⊗ldirichlet(dt); Dt+Dθ], [u0; 0.0]; tolerance=1E-6) @test ≈(u(0.2,0.1),u0(0.1);atol=1E-6) - d=PeriodicSegment() × ChebyshevInterval() + d=cartesianproduct(PeriodicSegment(), ChebyshevInterval()) u_ex=Fun((x,y)->real(cos(x+im*y)),d) @test u_ex(1.0,0.1) ≈ real(cos(1.0+im*0.1)) atol=10eps() B=Dirichlet(Space(d))