Skip to content

Commit 71da5fa

Browse files
authored
ContinuumArrays v0.17 (#172)
1 parent ab7ac97 commit 71da5fa

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

Project.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
2525

2626
[compat]
2727
ArrayLayouts = "1.0.9"
28-
BandedMatrices = "0.17.30, 1"
28+
BandedMatrices = "1"
2929
BlockArrays = "0.16.14"
3030
BlockBandedMatrices = "0.12.5"
31-
ClassicalOrthogonalPolynomials = "0.11.10"
32-
ContinuumArrays = "0.16.3"
31+
ClassicalOrthogonalPolynomials = "0.12"
32+
ContinuumArrays = "0.17"
3333
DomainSets = "0.6, 0.7"
3434
FastTransforms = "0.15.11"
3535
FillArrays = "1.0"
3636
HarmonicOrthogonalPolynomials = "0.5"
37-
InfiniteArrays = "0.12, 0.13"
37+
InfiniteArrays = "0.13"
3838
InfiniteLinearAlgebra = "0.7"
3939
LazyArrays = "1.0"
4040
LazyBandedMatrices = "0.9"

src/MultivariateOrthogonalPolynomials.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import Base.Broadcast: Broadcasted, broadcasted, DefaultArrayStyle
1111
import DomainSets: boundary, EuclideanDomain
1212

1313
import QuasiArrays: LazyQuasiMatrix, LazyQuasiArrayStyle, domain
14-
import ContinuumArrays: @simplify, Weight, weight, grid, plotgrid, TransformFactorization, ExpansionLayout, plotvalues, unweighted, plan_grid_transform, checkpoints, transform_ldiv, AbstractBasisLayout, basis_axes, Inclusion, grammatrix, weaklaplacian
14+
import ContinuumArrays: @simplify, Weight, weight, grid, plotgrid, TransformFactorization, ExpansionLayout, plotvalues, unweighted, plan_transform, checkpoints, transform_ldiv, AbstractBasisLayout, basis_axes, Inclusion, grammatrix, weaklaplacian
1515

1616
import ArrayLayouts: MemoryLayout, sublayout, sub_materialize
1717
import BlockArrays: block, blockindex, BlockSlice, viewblock, blockcolsupport, AbstractBlockStyle, BlockStyle

src/disk.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ end
256256
*(P::ZernikeTransform{T}, f::Matrix{T}) where T = ModalTrav(P.disk2cxf \ (P.analysis * f))
257257
*(P::ZernikeITransform, f::AbstractVector) = P.synthesis * (P.disk2cxf * ModalTrav(f).matrix)
258258

259-
plan_grid_transform(Z::Zernike{T}, B::Tuple{Block{1}}, dims=1:1) where T = grid(Z,B[1]), ZernikeTransform{T}(Int(B[1]), Z.a, Z.b)
259+
plan_transform(Z::Zernike{T}, (N,)::Tuple{Block{1}}, dims=1) where T = ZernikeTransform{T}(Int(N), Z.a, Z.b)
260260

261261
##
262262
# Laplacian

src/rect.jl

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,17 @@ function checkpoints(P::RectPolynomial)
9898
SVector.(x, y')
9999
end
100100

101-
function plan_grid_transform(P::KronPolynomial{d,<:Any,<:Fill}, B::Tuple{Block{1}}, dims=1:1) where d
101+
function plan_transform(P::KronPolynomial{d,<:Any,<:Fill}, B::Tuple{Block{1}}, dims=1:1) where d
102102
@assert dims == 1
103103

104104
T = first(P.args)
105-
x, F = plan_grid_transform(T, tuple(Fill(Int(B[1]),d)...))
106105
@assert d == 2
107-
= Vector(x)
108-
SVector.(x̃, x̃'), ApplyPlan(DiagTrav, F)
106+
ApplyPlan(DiagTrav, plan_transform(T, tuple(Fill(Int(B[1]),d)...)))
107+
end
108+
109+
function grid(P::RectPolynomial, B::Block{1})
110+
x,y = grid.(P.args, Int(B))
111+
SVector.(x, y')
109112
end
110113

111114
function plotgrid(P::RectPolynomial, B::Block{1})
@@ -114,14 +117,12 @@ function plotgrid(P::RectPolynomial, B::Block{1})
114117
end
115118

116119

117-
function plan_grid_transform(P::KronPolynomial{d}, B::Tuple{Block{1}}, dims=1:1) where d
120+
function plan_transform(P::KronPolynomial{d}, B::Tuple{Block{1}}, dims=1:1) where d
118121
@assert dims == 1 || dims == 1:1 || dims == (1,)
119122
@assert d == 2
120123
N = Int(B[1])
121-
xF = [plan_grid_transform(P.args[k], (N,N), k) for k=1:length(P.args)]
122-
x,y = map(first,xF)
123-
Fx,Fy = map(last,xF)
124-
SVector.(x, y'), ApplyPlan(DiagTrav, TensorPlan(Fx,Fy))
124+
Fx,Fy = plan_transform(P.args[1], (N,N), 1),plan_transform(P.args[2], (N,N), 2)
125+
ApplyPlan(DiagTrav, TensorPlan(Fx,Fy))
125126
end
126127

127128
applylayout(::Type{typeof(*)}, ::Lay, ::DiagTravLayout) where Lay <: AbstractBasisLayout = ExpansionLayout{Lay}()

src/triangle.jl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -784,10 +784,9 @@ TriPlan{T}(N::Block{1}, a, b, c) where T = TriPlan{T}(Matrix{T}(undef, Int(N), I
784784

785785
*(T::TriPlan, F::AbstractMatrix) = DiagTrav(tridenormalize!(T.tri2cheb\(T.grid2cheb*F),T.a,T.b,T.c))
786786

787-
function plan_grid_transform(P::JacobiTriangle, Bs::Tuple{Block{1}}, dims=1:1)
787+
function plan_transform(P::JacobiTriangle, (N,)::Tuple{Block{1}}, dims=1)
788788
T = eltype(P)
789-
N = Bs[1]
790-
grid(P, N), TriPlan{T}(N, P.a, P.b, P.c)
789+
TriPlan{T}(N, P.a, P.b, P.c)
791790
end
792791

793792
struct TriIPlan{T}

0 commit comments

Comments
 (0)