Skip to content

Commit 3c51b12

Browse files
authored
DomainSets 0.3 (#15)
* DomainSets 0.3 * remove Manifest
1 parent e311d92 commit 3c51b12

File tree

5 files changed

+18
-12
lines changed

5 files changed

+18
-12
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
deps/deps.jl
55
src/.DS_Store
66
.DS_Store
7+
Manifest.toml

Project.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "ApproxFunFourier"
22
uuid = "59844689-9c9d-51bf-9583-5b794ec66d30"
3-
version = "0.2.3"
3+
version = "0.2.4"
44

55
[deps]
66
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
@@ -15,12 +15,12 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
1515

1616
[compat]
1717
AbstractFFTs = "0.5"
18-
ApproxFunBase = "0.2, 0.3"
19-
DomainSets = "0.1, 0.2"
18+
ApproxFunBase = "0.3.4"
19+
DomainSets = "0.3"
2020
FFTW = "1.1"
2121
FastTransforms = "0.8"
2222
InfiniteArrays = "0.5, 0.6, 0.7"
23-
IntervalSets = "0.3.1, 0.4"
23+
IntervalSets = "0.5"
2424
Reexport = "0.2"
2525
SpecialFunctions = "0.8, 0.9, 0.10"
2626
julia = "1.3"

src/ApproxFunFourier.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import ApproxFunBase: normalize!, flipsign, FiniteRange, Fun, MatrixFun, UnsetSp
2727
plan_transform, plan_itransform, plan_transform!, plan_itransform!, transform, itransform, hasfasttransform,
2828
CanonicalTransformPlan, ICanonicalTransformPlan,
2929
Integral,
30-
domainspace, rangespace, boundary,
30+
domainspace, rangespace,
3131
union_rule, conversion_rule, maxspace_rule, conversion_type, maxspace, hasconversion, points,
3232
rdirichlet, ldirichlet, lneumann, rneumann, ivp, bvp,
3333
linesum, differentiate, integrate, linebilinearform, bilinearform,
@@ -47,7 +47,7 @@ import ApproxFunBase: normalize!, flipsign, FiniteRange, Fun, MatrixFun, UnsetSp
4747
block, blockstart, blockstop, blocklengths, isblockbanded, pointscompatible,
4848
AbstractProductSpace, MultivariateFun, BivariateSpace,
4949
@wrapperstructure, @wrapperspaces, @wrapper, @calculus_operator, resizedata!, slnorm, affine_setdiff,
50-
complexroots
50+
complexroots, EmptyDomain, RectDomain
5151

5252

5353
import DomainSets: Domain, indomain, UnionDomain, ProductDomain, FullSpace, Point, elements, DifferenceDomain,

src/Domains/PeriodicSegment.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,13 @@ issubset(a::IntervalOrSegment, b::PeriodicSegment) = PeriodicSegment(endpoints(a
110110

111111

112112

113-
boundary(d::ProductDomain{Tuple{A,B}}) where {A<:IntervalOrSegment,B<:PeriodicSegment} =
113+
boundary(d::RectDomain{<:Any,<:IntervalOrSegment,<:PeriodicSegment}) =
114114
UnionDomain((PeriodicSegment(Vec(rightendpoint(factor(d,1)),leftendpoint(factor(d,2))),Vec(rightendpoint(factor(d,1)),rightendpoint(factor(d,2)))),
115115
PeriodicSegment(Vec(leftendpoint(factor(d,1)),rightendpoint(factor(d,2))),Vec(leftendpoint(factor(d,1)),leftendpoint(factor(d,2))))))
116-
boundary(d::ProductDomain{Tuple{A,B}}) where {A<:PeriodicSegment,B<:IntervalOrSegment} =
116+
boundary(d::RectDomain{<:Any,<:PeriodicSegment,<:IntervalOrSegment}) =
117117
UnionDomain((PeriodicSegment(Vec(leftendpoint(factor(d,1)),leftendpoint(factor(d,2))),Vec(rightendpoint(factor(d,1)),leftendpoint(factor(d,2)))),
118118
PeriodicSegment(Vec(rightendpoint(factor(d,1)),rightendpoint(factor(d,2))),Vec(leftendpoint(factor(d,1)),rightendpoint(factor(d,2))))))
119-
boundary(d::ProductDomain{Tuple{A,B}}) where {A<:PeriodicSegment,B<:PeriodicSegment} = EmptyDomain()
119+
boundary(d::RectDomain{<:Any,<:PeriodicSegment,<:PeriodicSegment}) = EmptyDomain()
120120

121121
union_rule(A::SumSpace{<:Any,<:PeriodicSegment}, B::Space{<:IntervalOrSegment}) =
122122
union(Space(Interval(domain(A))), B)

test/runtests.jl

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
using ApproxFunFourier, ApproxFunBase, Test, SpecialFunctions, LinearAlgebra
2-
import ApproxFunBase: testspace, testtransforms, testmultiplication, testraggedbelowoperator,
3-
testbandedoperator, testblockbandedoperator, testbandedblockbandedoperator, testcalculus, Block, Vec, testfunctional
4-
import SpecialFunctions: factorial
2+
import ApproxFunBase: testspace, testtransforms, testmultiplication, testraggedbelowoperator,
3+
testbandedoperator, testblockbandedoperator, testbandedblockbandedoperator,
4+
testcalculus, Block, Vec, testfunctional, EmptyDomain, UnionDomain
5+
import SpecialFunctions: factorial
56

67
@testset "Periodic Domains" begin
78
@test 0.1 PeriodicSegment(2π,0)
@@ -15,6 +16,10 @@ using ApproxFunFourier, ApproxFunBase, Test, SpecialFunctions, LinearAlgebra
1516
@test ApproxFunBase.Vec(0,0.5) PeriodicSegment(ApproxFunBase.Vec(0.0,0), ApproxFunBase.Vec(0,1))
1617

1718
@test ApproxFunBase.Vec(1,0) Circle((0.,0.),1.)
19+
20+
@test (PeriodicSegment() × ChebyshevInterval()) isa UnionDomain
21+
@test (ChebyshevInterval() × PeriodicSegment()) isa UnionDomain
22+
@test (PeriodicSegment() × PeriodicSegment()) isa EmptyDomain
1823
end
1924

2025
@testset "Cos/SinSpace" begin

0 commit comments

Comments
 (0)