Merge pull request #55 from JuliaApproximation/domainsetscore

changes
JuliaApproximation · Oct 9, 2023 · 08a1de8 · 08a1de8
2 parents ae660fb + e7414f4
commit 08a1de8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/Project.toml b/Project.toml
@@ -34,7 +34,7 @@ ToeplitzMatrices = "c751599d-da0a-543b-9d20-d0a503d91d24"
 BlockArrays = "0.16"
 CompositeTypes = "0.1.3"
 DomainIntegrals = "0.4.2"
-DomainSets = "0.6.2"
+DomainSets = "0.6.2,0.7"
 FFTW = "1.6"
 FastGaussQuadrature = "0.4,0.5"
 FillArrays = "0.12,0.13"

diff --git a/src/bases/dictionary/dictionary.jl b/src/bases/dictionary/dictionary.jl
@@ -58,8 +58,7 @@ coefficienttype(dict::Dictionary) = coefficienttype(typeof(dict))
 prectype(D::Type{<:Dictionary}) = prectype(domaintype(D), codomaintype(D))
 numtype(D::Type{<:Dictionary}) = numtype(domaintype(D), codomaintype(D))
 
-# The dimension of a function set is the dimension of its domain type
-dimension(dict::Dictionary) = dimension(domaintype(dict))
+DomainSets.domaineltype(dict::Dictionary) = domaintype(dict)
 
 dimension(dict::Dictionary, i) = dimension(component(dict, i))
 

diff --git a/src/util/arrays/outerproductarrays.jl b/src/util/arrays/outerproductarrays.jl
@@ -43,7 +43,7 @@ Base.copyto!(dest::OuterProductArray, bc::Broadcast.Broadcasted{<:OPArrayStyle})
     OuterProductArray(map(argsi->broadcast(bc.f, argsi...), zip(map(components, bc.args)...))...)
 Base.copy(a::OuterProductArray) = OuterProductArray(map(copy, components(a))...)
 Base.similar(a::OuterProductArray) = OuterProductArray(map(similar, components(a))...)
-Base.similar(::Type{OuterProductArray{T}}, shape::Tuple{Union{Integer, Base.OneTo},Vararg{Union{Integer,Base.OneTo},N} where N}) where T =
+Base.similar(::Type{OuterProductArray{T}}, shape::Tuple{Union{Integer, Base.OneTo},Vararg{Union{Integer,Base.OneTo},N}}) where {T,N} =
     OuterProductArray(map(x->Base.similar(Vector{T}, x), shape)...)
 Base.similar(bc::Broadcast.Broadcasted{OPArrayStyle{N}},::Type{ElType}) where {N,ElType} =
     Base.similar(OuterProductArray{ElType}, axes(bc))

diff --git a/src/util/common.jl b/src/util/common.jl
@@ -122,12 +122,7 @@ subeltype(::Type{T}) where {T} = eltype(eltype(T))
 # Dimension
 ###############
 
-dimension(x) = dimension(typeof(x))
-dimension(::Type{T}) where {T <: Number} = 1
-dimension(::Type{SVector{N,T}}) where {N,T} = N
-dimension(::Type{<:NTuple{N,Any}}) where {N} = N
-dimension(::Type{CartesianIndex{N}}) where {N} = N
-dimension(::Type{T}) where {T} = 1
+DomainSets.euclideandimension(::Type{CartesianIndex{N}}) where {N} = N
 
 
 const Domain1d{T <: Number} = Domain{T}