centralize the definition of allowed indices (to reduce ambiguities)

Author: Alexander-Barth

src/cfconventions.jl

@@ -44,7 +44,7 @@ allowmissing(x::AbstractArray{T}) where {T} = convert(AbstractArray{Union{T, Mis
 
 
 
-function _filter(ncv::AbstractVariable, indices::Union{<:Integer,AbstractVector{<:Integer},Colon}...; accepted_status_flags = nothing)
+function _filter(ncv::AbstractVariable, indices...; accepted_status_flags = nothing)
     data = allowmissing(ncv[indices...])
 
     if (accepted_status_flags != nothing)

src/cfvariable.jl

@@ -442,21 +442,21 @@ end
 #@inline CFinvtransformdata(data::Char,fv,scale_factor,add_offset,time_origin,time_factor,DT) = CFtransform_replace_missing(data,fv)
 
 
-function Base.getindex(v::CFVariable, indexes::Union{Integer,Colon,AbstractRange{<:Integer},AbstractVector{<:Integer}}...)
+function Base.getindex(v::CFVariable, indexes::TIndices...)
     data = v.var[indexes...]
     return CFtransformdata(data,fill_and_missing_values(v),scale_factor(v),add_offset(v),
                            time_origin(v),time_factor(v),maskingvalue(v),eltype(v))
 end
 
-function Base.setindex!(v::CFVariable,data::Array{Missing,N},indexes::Union{Int,Colon,AbstractRange{<:Integer}}...) where N
+function Base.setindex!(v::CFVariable,data::Array{Missing,N},indexes::TIndices...) where N
     v.var[indexes...] = fill(fillvalue(v),size(data))
 end
 
-function Base.setindex!(v::CFVariable,data::Missing,indexes::Union{Int,Colon,AbstractRange{<:Integer}}...)
+function Base.setindex!(v::CFVariable,data::Missing,indexes::TIndices...)
     v.var[indexes...] = fillvalue(v)
 end
 
-function Base.setindex!(v::CFVariable,data::Union{T,Array{T,N}},indexes::Union{Int,Colon,AbstractRange{<:Integer}}...) where N where T <: Union{AbstractCFDateTime,DateTime,Union{Missing,DateTime,AbstractCFDateTime}}
+function Base.setindex!(v::CFVariable,data::Union{T,Array{T,N}},indexes::TIndices...) where N where T <: Union{AbstractCFDateTime,DateTime,Union{Missing,DateTime,AbstractCFDateTime}}
 
     if calendar(v) !== nothing
         # can throw an convertion error if calendar attribute already exists and
@@ -473,7 +473,7 @@ function Base.setindex!(v::CFVariable,data::Union{T,Array{T,N}},indexes::Union{I
 end
 
 
-function Base.setindex!(v::CFVariable,data,indexes::Union{Int,Colon,AbstractRange{<:Integer}}...)
+function Base.setindex!(v::CFVariable,data,indexes::TIndices...)
     v.var[indexes...] = CFinvtransformdata(
         data,fill_and_missing_values(v),
         scale_factor(v),add_offset(v),
@@ -602,7 +602,7 @@ NCDatasets.load!(ncv,data,buffer,:,:,:)
 close(ds)
 ```
 """
-@inline function load!(v::Union{CFVariable{T,N},MFCFVariable{T,N},SubVariable{T,N}}, data, buffer, indices::Union{Integer, AbstractRange{<:Integer}, Colon}...) where {T,N}
+@inline function load!(v::Union{CFVariable{T,N},MFCFVariable{T,N},SubVariable{T,N}}, data, buffer, indices::TIndices...) where {T,N}
 
     if v.var == nothing
         return load!(v,indices...)

src/groupby.jl

@@ -518,36 +518,36 @@ function Base.Array(gr::ReducedGroupedVariable)
     gr[ntuple(i -> Colon(),ndims(gr))...]
 end
 
-function Base.getindex(gr::ReducedGroupedVariable{T,N,TGV,typeof(sum)},indices::Union{Integer,Colon,AbstractRange{<:Integer},AbstractVector{<:Integer}}...) where {T,N,TGV}
+function Base.getindex(gr::ReducedGroupedVariable{T,N,TGV,typeof(sum)},indices::TIndices...) where {T,N,TGV}
     data,count = _mapreduce(gr.gv.map_fun,+,gr.gv,indices)
     data
 end
 
-function Base.getindex(gr::ReducedGroupedVariable{T,N,TGV,typeof(mean)},indices::Union{Integer,Colon,AbstractRange{<:Integer},AbstractVector{<:Integer}}...) where {T,N,TGV}
+function Base.getindex(gr::ReducedGroupedVariable{T,N,TGV,typeof(mean)},indices::TIndices...) where {T,N,TGV}
     data,count = _mapreduce(gr.gv.map_fun,+,gr.gv,indices)
     data ./ count
 end
 
 
-function Base.getindex(gr::ReducedGroupedVariable{T,N,TGV,TF},indices::Union{Integer,Colon,AbstractRange{<:Integer},AbstractVector{<:Integer}}...) where TF <: Union{typeof(var),typeof(maximum),typeof(minimum)} where {T,N,TGV}
+function Base.getindex(gr::ReducedGroupedVariable{T,N,TGV,TF},indices::TIndices...) where TF <: Union{typeof(var),typeof(maximum),typeof(minimum)} where {T,N,TGV}
 
     return _mapreduce_aggregation(
         gr.gv.map_fun,aggregator(TF),gr.gv,indices);
 end
 
 
-function Base.getindex(gr::ReducedGroupedVariable{T,N,TGV,typeof(std)},indices::Union{Integer,Colon,AbstractRange{<:Integer},AbstractVector{<:Integer}}...) where {T,N,TGV}
+function Base.getindex(gr::ReducedGroupedVariable{T,N,TGV,typeof(std)},indices::TIndices...) where {T,N,TGV}
 
     return sqrt.(_mapreduce_aggregation(
         gr.gv.map_fun,VarianceWelfordAggregation,gr.gv,indices))
 end
 
 
-_dim_after_getindex(dim,ind::Union{Colon,AbstractRange,AbstractVector},other...) = _dim_after_getindex(dim+1,other...)
+_dim_after_getindex(dim,ind::TIndices,other...) = _dim_after_getindex(dim+1,other...)
 _dim_after_getindex(dim,ind::Integer,other...) = _dim_after_getindex(dim,other...)
 _dim_after_getindex(dim) = dim
 
-function Base.getindex(gr::ReducedGroupedVariable{T},indices::Union{Integer,Colon,AbstractRange{<:Integer},AbstractVector{<:Integer}}...) where T
+function Base.getindex(gr::ReducedGroupedVariable{T},indices::TIndices...) where T
     gv = gr.gv
     sz = size_getindex(gr,indices...)
     data_by_class = Array{T}(undef,sz)

src/multifile.jl

@@ -157,8 +157,8 @@ function Base.keys(mfds::MFDataset)
     end
 end
 
-Base.getindex(v::MFVariable,indexes::Union{Integer,Colon,AbstractRange{<:Integer}}...) = getindex(v.var,indexes...)
-Base.setindex!(v::MFVariable,data,indexes::Union{Integer,Colon,AbstractRange{<:Integer}}...) = setindex!(v.var,data,indexes...)
+Base.getindex(v::MFVariable,indexes::TIndices...) = getindex(v.var,indexes...)
+Base.setindex!(v::MFVariable,data,indexes::TIndices...) = setindex!(v.var,data,indexes...)
 
 
 load!(v::MFVariable,buffer,indexes...) = CatArrays.load!(v.var,buffer,indexes...)

src/subvariable.jl

@@ -65,7 +65,7 @@ end
 
 Base.Array(v::SubVariable) = collect(v)
 
-function Base.view(v::SubVariable,indices::Union{Int,Colon,AbstractVector{Int}}...)
+function Base.view(v::SubVariable,indices::Union{<:Integer,Colon,AbstractVector{<:Integer}}...)
     sub_indices = subsub(v.indices,indices)
     SubVariable(parent(v),sub_indices...)
 end
@@ -96,7 +96,7 @@ close(ds)
 ```
 
 """
-Base.view(v::AbstractVariable,indices::Union{Int,Colon,AbstractVector{Int}}...) = SubVariable(v,indices...)
+Base.view(v::AbstractVariable,indices::Union{<:Integer,Colon,AbstractVector{<:Integer}}...) = SubVariable(v,indices...)
 Base.view(v::SubVariable,indices::CartesianIndex) = view(v,indices.I...)
 Base.view(v::SubVariable,indices::CartesianIndices) = view(v,indices.indices...)