Skip to content

CompatHelper: bump compat for "QuasiArrays" to "0.9" #109

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
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
16 changes: 8 additions & 8 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.2.3"
version = "0.2.4"

[deps]
ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
Expand Down Expand Up @@ -28,17 +28,17 @@ ArrayLayouts = "0.7"
BandedMatrices = "0.16"
BlockArrays = "0.16.7"
BlockBandedMatrices = "0.11"
ClassicalOrthogonalPolynomials = "0.4.2"
ContinuumArrays = "0.8, 0.9"
ClassicalOrthogonalPolynomials = "0.5.1"
ContinuumArrays = "0.10"
DomainSets = "0.5"
FastTransforms = "0.12"
FillArrays = "0.11, 0.12"
HarmonicOrthogonalPolynomials = "0.2"
FastTransforms = "0.13"
FillArrays = "0.12"
HarmonicOrthogonalPolynomials = "0.2.4"
InfiniteArrays = "0.12"
InfiniteLinearAlgebra = "0.6"
LazyArrays = "0.21.8, 0.22"
LazyArrays = "0.22.4"
LazyBandedMatrices = "0.7"
QuasiArrays = "0.8"
QuasiArrays = "0.9"
SpecialFunctions = "1"
StaticArrays = "1"
julia = "1.6"
Expand Down
6 changes: 3 additions & 3 deletions src/MultivariateOrthogonalPolynomials.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ using ClassicalOrthogonalPolynomials, FastTransforms, BlockBandedMatrices, Block
LazyArrays, SpecialFunctions, LinearAlgebra, BandedMatrices, LazyBandedMatrices, ArrayLayouts,
HarmonicOrthogonalPolynomials

import Base: axes, in, ==, *, ^, \, copy, OneTo, getindex, size, oneto, all
import Base: axes, in, ==, *, ^, \, copy, OneTo, getindex, size, oneto, all, resize!
import DomainSets: boundary

import QuasiArrays: LazyQuasiMatrix, LazyQuasiArrayStyle
import ContinuumArrays: @simplify, Weight, grid, plotgrid, TransformFactorization, Expansion
import ContinuumArrays: @simplify, Weight, grid, plotgrid, TransformFactorization, ExpansionLayout

import ArrayLayouts: MemoryLayout, sublayout, sub_materialize
import BlockArrays: block, blockindex, BlockSlice, viewblock
Expand All @@ -20,7 +20,7 @@ import LazyArrays: arguments, paddeddata, LazyArrayStyle, LazyLayout
import LazyBandedMatrices: LazyBandedBlockBandedLayout, AbstractBandedBlockBandedLayout, AbstractLazyBandedBlockBandedLayout
import InfiniteArrays: InfiniteCardinal

import ClassicalOrthogonalPolynomials: jacobimatrix, Weighted, orthogonalityweight, HalfWeighted
import ClassicalOrthogonalPolynomials: jacobimatrix, Weighted, orthogonalityweight, HalfWeighted, WeightedBasis
import HarmonicOrthogonalPolynomials: BivariateOrthogonalPolynomial, MultivariateOrthogonalPolynomial, Plan,
PartialDerivative, AngularMomentum, BlockOneTo, BlockRange1, interlace

Expand Down
4 changes: 2 additions & 2 deletions src/triangle.jl
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ getindex(P::JacobiTriangle, xy::SVector{2}, JR::BlockOneTo) =
# Clenshaw
###

function getindex(f::Expansion{T,<:JacobiTriangle}, xy::SVector{2}) where T
function getindex(f::ApplyQuasiVector{T,typeof(*),<:Tuple{JacobiTriangle,AbstractVector}}, xy::SVector{2})::T where T
P,c∞ = arguments(f)
c = paddeddata(c∞)
N = blocksize(c,1)
Expand Down Expand Up @@ -605,7 +605,7 @@ function getindex(f::Expansion{T,<:JacobiTriangle}, xy::SVector{2}) where T
γ1[1]
end

getindex(f::Expansion{T,<:JacobiTriangle}, xys::AbstractArray{<:SVector{2}}) where T =
getindex(f::ApplyQuasiVector{T,typeof(*),<:Tuple{JacobiTriangle,AbstractVector}}, xys::AbstractArray{<:SVector{2}}) where T =
[f[xy] for xy in xys]

# getindex(f::Expansion{T,<:JacobiTriangle}, x::AbstractVector{<:Number}) where T =
Expand Down
2 changes: 1 addition & 1 deletion test/test_triangle.jl
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ import MultivariateOrthogonalPolynomials: tri_forwardrecurrence, grid, TriangleR
xy = SVector(0.1,0.2)
c = PseudoBlockVector([1; Zeros(∞)], (axes(P,2),))
f = P*c
@test f[xy] == 1.0
@test @inferred(f[xy]) == 1.0
c = PseudoBlockVector([1:3; Zeros(∞)], (axes(P,2),))
f = P*c
@test f[xy] ≈ P[xy,1:3]'*(1:3)
Expand Down