Remove subsetcube function

This function is not used anymore,
because the indexing is now handled in DimensionalData.

Author: felixcremer

src/Cubes/Cubes.jl

@@ -19,10 +19,6 @@ import DimensionalData: name
 
 export concatenatecubes, caxes, subsetcube, readcubedata, renameaxis!, YAXArray, setchunks, cache
 
-"""
-This function calculates a subset of a cube's data
-"""
-function subsetcube end
 
 "Returns the axes of a Cube"
 function caxes end
@@ -353,53 +349,12 @@ _iscompressed(c::DiskArrays.PermutedDiskArray) = _iscompressed(c.a.parent)
 _iscompressed(c::DiskArrays.SubDiskArray) = _iscompressed(c.v.parent)
 _iscompressed(c) = YAXArrayBase.iscompressed(c)
 
-# lift renameaxis functionality from Axes.jl to YAXArrays
+# lift renameaxis functionality from DimensionalData to YAXArrays
 renameaxis!(c::YAXArray, p::Pair) = DD.set(c, Symbol(first(p)) => last(p))
 
-function _subsetcube end
-
-function subsetcube(z::YAXArray{T}; kwargs...) where {T}
-    newaxes, substuple = _subsetcube(z, collect(Any, map(Base.OneTo, size(z))); kwargs...)
-    newdata = view(getdata(z), substuple...)
-    YAXArray(newaxes, newdata, z.properties, cleaner=z.cleaner)
-end
-
 sorted(x, y) = x < y ? (x, y) : (y, x)
 
 
-function _subsetcube(z, subs; kwargs...)
-    kwargs = Dict{Any,Any}(kwargs)
-    for f in YAXDefaults.subsetextensions
-        f(kwargs)
-    end
-    newaxes = deepcopy(collect(DD.Dimension, caxes(z)))
-    foreach(kwargs) do kw
-        axdes, subexpr = kw
-        axdes = string(axdes)
-        iax = findAxis(axdes, caxes(z))
-        if isa(iax, Nothing)
-            throw(ArgumentError("Axis $axdes not found in cube"))
-        else
-            oldax = newaxes[iax]
-            subinds = interpretsubset(subexpr, oldax)
-            subs2 = subs[iax][subinds]
-            subs[iax] = subs2
-            if !isa(subinds, AbstractVector) && !isa(subinds, AbstractRange)
-                newaxes[iax] = axcopy(oldax, oldax.values[subinds:subinds])
-            else
-                newaxes[iax] = axcopy(oldax, oldax.values[subinds])
-            end
-        end
-    end
-    substuple = ntuple(i -> subs[i], length(subs))
-    inewaxes = findall(i -> isa(i, AbstractVector), substuple)
-    newaxes = newaxes[inewaxes]
-    @assert length.(newaxes) ==
-            map(length, filter(i -> isa(i, AbstractVector), collect(substuple)))
-    newaxes, substuple
-end
-
-
 function Base.getindex(a::YAXArray, args::DD.Dimension...; kwargs...) 
     kwargsdict = Dict{Any,Any}(kwargs...)
     for ext in YAXDefaults.subsetextensions

src/DatasetAPI/Datasets.jl

@@ -1,5 +1,5 @@
 module Datasets
-import ..Cubes: Cubes, YAXArray, concatenatecubes, CleanMe, subsetcube, copy_diskarray, setchunks, caxes
+import ..Cubes: Cubes, YAXArray, concatenatecubes, CleanMe, copy_diskarray, setchunks, caxes
 using ...YAXArrays: YAXArrays, YAXDefaults, findAxis
 using DataStructures: OrderedDict, counter
 using Dates: Day, Hour, Minute, Second, Month, Year, Date, DateTime, TimeType, AbstractDateTime, Period
@@ -478,7 +478,6 @@ function open_dataset(g; skip_keys=(), driver = :all)
         Dataset(allcubes, sdimlist,gatts)
     end
 end
-#Base.getindex(x::Dataset; kwargs...) = subsetcube(x; kwargs...)
 YAXDataset(; kwargs...) = Dataset(YAXArrays.YAXDefaults.cubedir[]; kwargs...)
 
 

test/Cubes/cubes.jl

@@ -95,6 +95,7 @@ using DimensionalData
         @test YAXArrayBase.iscompressed(a) == false
     end
 
+
     @testset "cubesize" begin
         @test Cubes.cubesize(a) == 160
         a32 = map(Float32, a)
@@ -104,28 +105,4 @@ using DimensionalData
         @test endswith(Cubes.formatbytes(1205), "KB")
         @test endswith(Cubes.formatbytes(1200000), "MB")
     end
-#=
-    @testset "Subsets" begin
-        s = YAXArrays.Cubes.subsetcube(a, X = 1.5..3.5)
-        @test s.data == [2 6 10 14 18; 3 7 11 15 19]
-        @test s.axes[1] == X(2.0:3.0)
-        @test s.axes[2] == Y([1, 2, 3, 4, 5])
-        ax = a.axes[1]
-        @test YAXArrays.Cubes.interpretsubset(CartesianIndices((1:2,)), ax) == 1:2
-        @test YAXArrays.Cubes.interpretsubset(CartesianIndex((2,)), ax) == 2
-        @test YAXArrays.Cubes.interpretsubset(2.1, ax) == 2
-        @test YAXArrays.Cubes.interpretsubset((3.5, 1.5), ax) == 2:3
-        @test YAXArrays.Cubes.interpretsubset(0.8..2.2, ax) == 1:2
-        tax = RangeAxis("ADate", Date(2001):Day(1):Date(2003, 2, 28))
-        @test YAXArrays.Cubes.interpretsubset((Date(2001, 1, 2), Date(2001, 1, 5)), tax) ==
-              2:4
-        @test YAXArrays.Cubes.interpretsubset(2001:2002, tax) == 1:730
-        @test YAXArrays.Cubes.interpretsubset([1, 3, 5], a.axes[2]) == [1, 3, 5]
-
-        s2 = a[X = 0.5..3.5, Y = [1, 5, 4]]
-        @test s2.data == [1 17 13; 2 18 14; 3 19 15]
-        @test s2.axes[1] == X(1.0:3.0)
-        @test s2.axes[2] == Y([1, 5, 4])
-    end
-=#
 end