Skip to content

CompatHelper: bump compat for QuasiArrays to 0.10, (keep existing compat) #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ jobs:
fail-fast: false
matrix:
version:
- '1.7'
- '1'
- '^1.9.0-0'
- '1.9'
os:
- ubuntu-latest
- macOS-latest
Expand Down
25 changes: 13 additions & 12 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "MultivariateOrthogonalPolynomials"
uuid = "4f6956fd-4f93-5457-9149-7bfc4b2ce06d"
version = "0.4.3"
version = "0.5"

[deps]
ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
Expand All @@ -24,29 +24,30 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[compat]
ArrayLayouts = "0.8.6, 1"
BandedMatrices = "0.17"
ArrayLayouts = "1.0.9"
BandedMatrices = "0.17.30"
BlockArrays = "0.16.14"
BlockBandedMatrices = "0.11.5, 0.12"
ClassicalOrthogonalPolynomials = "0.7, 0.8"
ContinuumArrays = "0.12"
DomainSets = "0.5, 0.6"
BlockBandedMatrices = "0.12"
ClassicalOrthogonalPolynomials = "0.10"
ContinuumArrays = "0.13"
DomainSets = "0.6"
FastTransforms = "0.15"
FillArrays = "0.13, 1"
FillArrays = "1.0"
HarmonicOrthogonalPolynomials = "0.4"
InfiniteArrays = "0.12"
InfiniteLinearAlgebra = "0.6.6"
LazyArrays = "0.22.10, 1"
LazyArrays = "1.0"
LazyBandedMatrices = "0.8.4"
QuasiArrays = "0.9"
QuasiArrays = "0.10"
SpecialFunctions = "1, 2"
StaticArrays = "1"
julia = "1.7"
julia = "1.9"

[extras]
Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["ForwardDiff", "RecipesBase", "Test"]
test = ["Base64", "ForwardDiff", "RecipesBase", "Test"]
2 changes: 1 addition & 1 deletion src/MultivariateOrthogonalPolynomials.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ using ClassicalOrthogonalPolynomials, FastTransforms, BlockBandedMatrices, Block
LazyArrays, SpecialFunctions, LinearAlgebra, BandedMatrices, LazyBandedMatrices, ArrayLayouts,
HarmonicOrthogonalPolynomials

import Base: axes, in, ==, *, ^, \, copy, copyto!, OneTo, getindex, size, oneto, all, resize!, BroadcastStyle, similar, fill!, setindex!, convert
import Base: axes, in, ==, *, ^, \, copy, copyto!, OneTo, getindex, size, oneto, all, resize!, BroadcastStyle, similar, fill!, setindex!, convert, show, summary
import Base.Broadcast: Broadcasted, broadcasted, DefaultArrayStyle
import DomainSets: boundary

Expand Down
3 changes: 2 additions & 1 deletion src/disk.jl
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ axes(P::Zernike{T}) where T = (Inclusion(UnitDisk{T}()),blockedrange(oneto(∞))

copy(A::Zernike) = A

Base.summary(io::IO, P::Zernike) = print(io, "Zernike($(P.a), $(P.b))")
show(io::IO, P::Zernike) = summary(io, P)
summary(io::IO, P::Zernike) = print(io, "Zernike($(P.a), $(P.b))")

orthogonalityweight(Z::Zernike) = ZernikeWeight(Z.a, Z.b)

Expand Down
8 changes: 8 additions & 0 deletions src/rect.jl
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,17 @@ KronPolynomial{d,T}(a::AbstractVector) where {d,T} = KronPolynomial{d,T,typeof(a
KronPolynomial{d}(a::AbstractVector) where d = KronPolynomial{d,eltype(eltype(a))}(a)
KronPolynomial(a::AbstractVector) = KronPolynomial{length(a)}(a)

function show(io::IO, P::KronPolynomial)
for k = 1:length(P.args)
print(io, "$(P.args[k])")
k ≠ length(P.args) && print(io, " ⊗ ")
end
end

const RectPolynomial{T, PP} = KronPolynomial{2, T, PP}



axes(P::KronPolynomial) = (Inclusion(×(map(domain, axes.(P.args, 1))...)), _krontrav_axes(axes.(P.args, 2)...))
function getindex(P::RectPolynomial{T}, xy::StaticVector{2}, Jj::BlockIndex{1})::T where T
a,b = P.args
Expand Down
7 changes: 4 additions & 3 deletions src/rectdisk.jl
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ DunklXuDisk() = DunklXuDisk(0)
axes(P::DunklXuDisk{T}) where T = (Inclusion(UnitDisk{T}()),blockedrange(oneto(∞)))

copy(A::DunklXuDisk) = A

Base.summary(io::IO, P::DunklXuDisk) = print(io, "DunklXuDisk($(P.β))")
show(io::IO, P::DunklXuDisk) = summary(io, P)
summary(io::IO, P::DunklXuDisk) = print(io, "DunklXuDisk($(P.β))")


"""
Expand All @@ -32,7 +32,8 @@ DunklXuDiskWeight(β::T) where T = DunklXuDiskWeight{float(T),T}(β)

axes(P::DunklXuDiskWeight{T}) where T = (Inclusion(UnitDisk{T}()),)

Base.summary(io::IO, P::DunklXuDiskWeight) = print(io, "(1-x^2-y^2)^$(P.β) on the unit disk")
show(io::IO, P::DunklXuDiskWeight) = summary(io, P)
summary(io::IO, P::DunklXuDiskWeight) = print(io, "(1-x^2-y^2)^$(P.β) on the unit disk")

const WeightedDunklXuDisk{T} = WeightedBasis{T,<:DunklXuDiskWeight,<:DunklXuDisk}

Expand Down
6 changes: 4 additions & 2 deletions src/triangle.jl
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ axes(P::JacobiTriangle{T}) where T = (Inclusion(UnitTriangle{T}()),blockedrange(

copy(A::JacobiTriangle) = A

Base.summary(io::IO, P::JacobiTriangle) = print(io, "JacobiTriangle($(P.a), $(P.b), $(P.c))")
show(io::IO, P::JacobiTriangle) = summary(io, P)
summary(io::IO, P::JacobiTriangle) = print(io, "JacobiTriangle($(P.a), $(P.b), $(P.c))")


"""
Expand Down Expand Up @@ -71,7 +72,8 @@ end

==(wB::WeightedTriangle, w_A::WeightedBasis{<:Any,<:TriangleWeight,<:JacobiTriangle}) = w_A == wB

Base.summary(io::IO, P::TriangleWeight) = print(io, "x^$(P.a)*y^$(P.b)*(1-x-y)^$(P.c) on the unit triangle")
show(io::IO, P::TriangleWeight) = summary(io, P)
summary(io::IO, P::TriangleWeight) = print(io, "x^$(P.a)*y^$(P.b)*(1-x-y)^$(P.c) on the unit triangle")

orthogonalityweight(P::JacobiTriangle) = TriangleWeight(P.a, P.b, P.c)

Expand Down
7 changes: 6 additions & 1 deletion test/test_disk.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using MultivariateOrthogonalPolynomials, ClassicalOrthogonalPolynomials, StaticArrays, BlockArrays, BandedMatrices, FastTransforms, LinearAlgebra, RecipesBase, Test, SpecialFunctions, LazyArrays, InfiniteArrays
using MultivariateOrthogonalPolynomials, ClassicalOrthogonalPolynomials, StaticArrays, BlockArrays, BandedMatrices, FastTransforms, LinearAlgebra, Test, SpecialFunctions, LazyArrays, InfiniteArrays, Base64
using RecipesBase
import MultivariateOrthogonalPolynomials: ModalTrav, grid, ZernikeTransform, ZernikeITransform, *, ModalInterlace
import ClassicalOrthogonalPolynomials: HalfWeighted, expand
import ForwardDiff: hessian
Expand Down Expand Up @@ -566,4 +567,8 @@ end
@test sum(expand(P, 𝐱 -> 1)) ≈ π
@test sum(expand(P, 𝐱 -> ((x,y) = 𝐱; exp(x*cos(y))))) ≈ 3.4898933353782744
end

@testset "Show" begin
@test stringmime("text/plain", Zernike()) == "Zernike(0.0, 0.0)"
end
end
7 changes: 6 additions & 1 deletion test/test_rect.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using MultivariateOrthogonalPolynomials, ClassicalOrthogonalPolynomials, StaticArrays, LinearAlgebra, BlockArrays, FillArrays, Test
using MultivariateOrthogonalPolynomials, ClassicalOrthogonalPolynomials, StaticArrays, LinearAlgebra, BlockArrays, FillArrays, Base64, Test
import ClassicalOrthogonalPolynomials: expand

@testset "RectPolynomial" begin
Expand Down Expand Up @@ -91,4 +91,9 @@ import ClassicalOrthogonalPolynomials: expand

@test (P²[:,Block.(1:100)] \ f) ≈ f.args[2][Block.(1:100)]
end

@testset "Show" begin
@test stringmime("text/plain", KronPolynomial(Legendre(), Chebyshev())) == "Legendre() ⊗ ChebyshevT()"
@test stringmime("text/plain", KronPolynomial(Legendre(), Chebyshev(), Jacobi(1,1))) == "Legendre() ⊗ ChebyshevT() ⊗ Jacobi(1.0, 1.0)"
end
end
7 changes: 6 additions & 1 deletion test/test_rectdisk.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using MultivariateOrthogonalPolynomials, StaticArrays, BlockArrays, BlockBandedMatrices, ArrayLayouts,
using MultivariateOrthogonalPolynomials, StaticArrays, BlockArrays, BlockBandedMatrices, ArrayLayouts, Base64,
QuasiArrays, Test, ClassicalOrthogonalPolynomials, BandedMatrices, FastTransforms, LinearAlgebra
import MultivariateOrthogonalPolynomials: dunklxu_raising, dunklxu_lowering, AngularMomentum

Expand Down Expand Up @@ -81,4 +81,9 @@ import MultivariateOrthogonalPolynomials: dunklxu_raising, dunklxu_lowering, Ang
@test Dy[KR,JR] isa BandedBlockBandedMatrix
end
end

@testset "show" begin
@test stringmime("text/plain", DunklXuDisk()) == "DunklXuDisk(0)"
@test stringmime("text/plain", DunklXuDiskWeight(0)) == "(1-x^2-y^2)^0 on the unit disk"
end
end
5 changes: 5 additions & 0 deletions test/test_triangle.jl
Original file line number Diff line number Diff line change
Expand Up @@ -451,4 +451,9 @@ import MultivariateOrthogonalPolynomials: tri_forwardrecurrence, grid, TriangleR
C = P¹ \ (L * P)
@test C[1:10,1:10] ≈ A[1:10,1:10] - B[1:10,1:10]
end

@testset "show" begin
@test stringmime("text/plain", JacobiTriangle()) == "JacobiTriangle(0, 0, 0)"
@test stringmime("text/plain", TriangleWeight(1,2,3)) == "x^1*y^2*(1-x-y)^3 on the unit triangle"
end
end