Skip to content

Commit 4737f65

Browse files
committed
Fix Domain1d replacement
1 parent 86e910c commit 4737f65

File tree

5 files changed

+54
-24
lines changed

5 files changed

+54
-24
lines changed

Project.toml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name = "ApproxFunBase"
2+
uuid = "fbd15aa5-315a-5a7d-a8a4-24992e37be05"
3+
4+
[deps]
5+
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
6+
BandedMatrices = "aae01518-5342-5314-be14-df237901396f"
7+
BlockArrays = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
8+
BlockBandedMatrices = "ffab5731-97b5-5995-9138-79e8c1846df0"
9+
Calculus = "49dc2e85-a5d0-5ad3-a950-438e2897f1b9"
10+
DSP = "717857b8-e6f2-59f4-9121-6e50c889abd2"
11+
DomainSets = "5b8099bc-c8ec-5219-889f-1d9e522a28bf"
12+
DualNumbers = "fa6b7ba4-c1ee-5f82-b5fc-ecf0adba8f74"
13+
FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
14+
FastGaussQuadrature = "442a2c76-b920-505d-bb47-c5924d526838"
15+
FastTransforms = "057dd010-8810-581a-b7be-e3fc3b93f78c"
16+
FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
17+
InfiniteArrays = "4858937d-0d70-526a-a4dd-2d5cb5dd786c"
18+
IntervalSets = "8197267c-284f-5f27-9208-e0e47529a953"
19+
LazyArrays = "5078a376-72f3-5289-bfd5-ec5146d43c02"
20+
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
21+
LowRankApprox = "898213cb-b102-5a47-900c-97e73b919f73"
22+
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
23+
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
24+
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
25+
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
26+
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
27+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
28+
ToeplitzMatrices = "c751599d-da0a-543b-9d20-d0a503d91d24"
29+
30+
[compat]
31+
AbstractFFTs = "≥ 0.3.1"
32+
BandedMatrices = "0.9.0"
33+
BlockArrays = "0.8.0"
34+
BlockBandedMatrices = "0.4.0"
35+
Calculus = "≥ 0.1.15"
36+
DSP = "≥ 0.5.1"
37+
DomainSets = "0.0.1, 0.0.2"
38+
DualNumbers = "0.6.2"
39+
FFTW = "≥ 0.2.4"
40+
FastGaussQuadrature = "≥ 0.3.2"
41+
FastTransforms = "≥ 0.4.2"
42+
FillArrays = "≥ 0.5.0"
43+
InfiniteArrays = "0.0.3"
44+
IntervalSets = "≥ 0.3.1"
45+
LazyArrays = "0.8.0"
46+
LowRankApprox = "≥ 0.1.4"
47+
SpecialFunctions = "≥ 0.7.0"
48+
StaticArrays = "≥ 0.8.3"
49+
ToeplitzMatrices = "≥ 0.4.0"
50+
julia = "0.7, 1.0"

REQUIRE

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/Multivariate/ProductFun.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ ProductFun(f::Function,dx::Space,dy::Space)=ProductFun(dynamic(f),TensorSpace(dx
7474

7575
ProductFun(f::Function,D::Domain,M::Integer,N::Integer) = ProductFun(dynamic(f),Space(D),M,N)
7676
ProductFun(f::Function,d::Domain) = ProductFun(dynamic(f),Space(d))
77-
ProductFun(f::Function, dx::EuclideanDomain{1}, dy::EuclideanDomain{1}) = ProductFun(dynamic(f),Space(dx),Space(dy))
77+
ProductFun(f::Function, dx::Domain{<:Number}, dy::Domain{<:Number}) = ProductFun(dynamic(f),Space(dx),Space(dy))
7878
ProductFun(f::Function) = ProductFun(dynamic(f),ChebyshevInterval(),ChebyshevInterval())
7979

8080
## Conversion from other 2D Funs

src/Space.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ abstract type Space{D,R} end
1818

1919
const RealSpace = Space{D,R} where {D,R<:Real}
2020
const ComplexSpace = Space{D,R} where {D,R<:Complex}
21-
const UnivariateSpace = Space{D,R} where {D<:EuclideanDomain{1},R}
21+
const UnivariateSpace = Space{D,R} where {D<:Domain{<:Number},R}
2222
const BivariateSpace = Space{D,R} where {D<:EuclideanDomain{2},R}
23-
const RealUnivariateSpace = RealSpace{D,R} where {D<:EuclideanDomain{1},R<:Real}
23+
const RealUnivariateSpace = RealSpace{D,R} where {D<:Domain{<:Number},R<:Real}
2424

2525

2626

src/specialfunctions.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ for OP in (:abs,:sign,:log,:angle)
379379
@eval begin
380380
$OP(f::Fun{<:PiecewiseSpace{<:Any,<:Any,<:Real},<:Real}) =
381381
Fun(map($OP,components(f)),PiecewiseSpace)
382-
$OP(f::Fun{<:PiecewiseSpace{<:Any,<:EuclideanDomain{1}}}) =
382+
$OP(f::Fun{<:PiecewiseSpace{<:Any,<:Domain{<:Number}}}) =
383383
Fun(map($OP,components(f)),PiecewiseSpace)
384384
end
385385
end

0 commit comments

Comments
 (0)