Skip to content

Commit

Permalink
Merge pull request #122 from rafaqz/bounds
Browse files Browse the repository at this point in the history 
bugfix and test bounds with Irregular
  • Loading branch information
@rafaqz
rafaqz authored Apr 13, 2020
2 parents e5e0cd5 + d111c90 commit 913b45a
Show file tree
Hide file tree
Showing 3 changed files with 89 additions and 61 deletions.
2 changes: 1 addition & 1 deletion src/primitives.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ end
(), (rebuild(d, d[relate(d, i)], slicemode(mode(d), val(d), i)),)
# TODO deal with unordered arrays trashing the index order
@inline slicedims(d::Dimension{<:AbstractArray}, i::AbstractArray) =
(rebuild(d, d[relate(d, i)]),), ()
(rebuild(d, d[relate(d, i)], slicemode(mode(d), val(d), i)),), ()
@inline slicedims(d::Dimension{<:Colon}, i::Colon) = (d,), ()
@inline slicedims(d::Dimension{<:Colon}, i::AbstractArray) = (d,), ()
@inline slicedims(d::Dimension{<:Colon}, i::Number) = (), (d,)
Expand Down
120 changes: 67 additions & 53 deletions test/mode.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,24 +94,28 @@ end
Ordered(Reverse(), Reverse(), Forward())
end

@testset "slicebounds and slicemode" begin
@testset "slicbounds" begin
index = [10.0, 20.0, 30.0, 40.0, 50.0]
bound = (10.0, 60.0)
@test slicebounds(Start(), bounds, index, 2:3) == (20.0, 40.0)
bound = (0.0, 50.0)
@test slicebounds(End(), bounds, index, 2:3) == (10.0, 30.0)
bound = (0.5, 55.0)
@test slicebounds(Center(), bounds, index, 2:3) == (15.0, 35.0)
end

@testset "slicemode" begin
index = [10.0, 20.0, 30.0, 40.0, 50.0]

@testset "forwards" begin
@testset "Irregular forwards" begin
mode = Sampled(span=Irregular((10.0, 60.0)), sampling=Intervals(Start()))
mode = Sampled(Ordered(), Irregular((10.0, 60.0)), Intervals(Start()))
@test bounds(slicemode(mode, index, 3), X(index)) == (30.0, 40.0)
@test bounds(slicemode(mode, index, 1:5), X(index)) == (10.0, 60.0)
@test bounds(slicemode(mode, index, 2:3), X(index)) == (20.0, 40.0)
end

@testset "reverse" begin
@testset "Irregular reverse" begin
mode = Sampled(order=Ordered(index=Reverse()), span=Irregular(10.0, 60.0),
sampling=Intervals(Start()))
mode = Sampled(Ordered(index=Reverse()), Irregular(10.0, 60.0), Intervals(Start()))
Expand All @@ -138,70 +142,80 @@ end
@test bounds(slicemode(mode, index, 1:5), X()) == (nothing, nothing)
end

@testset "regular intervals are unchanged" begin
@testset "Regular is unchanged" begin
mode = Sampled(span=Regular(1.0), sampling=Intervals(Start()))
mode = Sampled(Ordered(), Regular(1.0), Intervals(Start()))
@test slicemode(mode, index, 2:3) === mode
end

@testset "point sampling is unchanged" begin
@testset "Points is unchanged" begin
mode = Sampled(span=Regular(1.0), sampling=Points())
mode = Sampled(Ordered(), Regular(1.0), Points())
@test slicemode(mode, index, 2:3) === mode
end

end
@testset "Intervals bounds" begin
@testset "Regular" begin
@testset "forward index" begin
index = 10.0:10.0:50.0
dim = X(index; mode=Sampled(order=Ordered(), sampling=Intervals(Start()), span=Regular(10.0)))
@test bounds(dim) == (10.0, 60.0)
dim = X(index; mode=Sampled(order=Ordered(), sampling=Intervals(End()), span=Regular(10.0)))
@test bounds(dim) == (0.0, 50.0)
dim = X(index; mode=Sampled(Ordered(), Regular(10.0), Intervals(Start())))
@test bounds(dim) == (10.0, 60.0)
dim = X(index; mode=Sampled(Ordered(), Regular(10.0), Intervals(End())))
@test bounds(dim) == (0.0, 50.0)
dim = X(index; mode=Sampled(Ordered(), Regular(10.0), Intervals(Center())))
@test bounds(dim) == (5.0, 55.0)

@testset "bounds" begin

@testset "Intervals" begin
@testset "Regular bounds are calculated from interval type and span value" begin
@testset "forward index" begin
index = 10.0:10.0:50.0
dim = X(index; mode=Sampled(order=Ordered(), sampling=Intervals(Start()), span=Regular(10.0)))
@test bounds(dim) == (10.0, 60.0)
dim = X(index; mode=Sampled(order=Ordered(), sampling=Intervals(End()), span=Regular(10.0)))
@test bounds(dim) == (0.0, 50.0)
dim = X(index; mode=Sampled(Ordered(), Regular(10.0), Intervals(Start())))
@test bounds(dim) == (10.0, 60.0)
dim = X(index; mode=Sampled(Ordered(), Regular(10.0), Intervals(End())))
@test bounds(dim) == (0.0, 50.0)
dim = X(index; mode=Sampled(Ordered(), Regular(10.0), Intervals(Center())))
@test bounds(dim) == (5.0, 55.0)
end
@testset "reverse index" begin
revindex = [10.0, 9.0, 8.0, 7.0, 6.0]
dim = X(revindex; mode=Sampled(; order=Ordered(Reverse(),Forward(),Forward()),
sampling=Intervals(Start()), span=Regular(-1.0)))
dim = X(revindex; mode=Sampled(Ordered(Reverse(),Forward(),Forward()), Regular(-1.0), Intervals(Start())))
@test bounds(dim) == (6.0, 11.0)
dim = X(revindex; mode=Sampled(; order=Ordered(Reverse(),Forward(),Forward()),
sampling=Intervals(End()), span=Regular(-1.0)))
dim = X(revindex; mode=Sampled(Ordered(Reverse(),Forward(),Forward()), Regular(-1.0), Intervals(End())))
@test bounds(dim) == (5.0, 10.0)
dim = X(revindex; mode=Sampled(; order=Ordered(Reverse(),Forward(),Forward()),
sampling=Intervals(Center()), span=Regular(-1.0)))
dim = X(revindex; mode=Sampled(Ordered(Reverse(),Forward(),Forward()), Regular(-1.0), Intervals(Center())))
@test bounds(dim) == (5.5, 10.5)
end
end
@testset "reverse index" begin
revindex = [10.0, 9.0, 8.0, 7.0, 6.0]
dim = X(revindex; mode=Sampled(; order=Ordered(Reverse(),Forward(),Forward()),
sampling=Intervals(Start()), span=Regular(-1.0)))
dim = X(revindex; mode=Sampled(Ordered(Reverse(),Forward(),Forward()), Regular(-1.0), Intervals(Start())))
@test bounds(dim) == (6.0, 11.0)
dim = X(revindex; mode=Sampled(; order=Ordered(Reverse(),Forward(),Forward()),
sampling=Intervals(End()), span=Regular(-1.0)))
dim = X(revindex; mode=Sampled(Ordered(Reverse(),Forward(),Forward()), Regular(-1.0), Intervals(End())))
@test bounds(dim) == (5.0, 10.0)
dim = X(revindex; mode=Sampled(; order=Ordered(Reverse(),Forward(),Forward()),
sampling=Intervals(Center()), span=Regular(-1.0)))
dim = X(revindex; mode=Sampled(Ordered(Reverse(),Forward(),Forward()), Regular(-1.0), Intervals(Center())))
@test bounds(dim) == (5.5, 10.5)
@testset "Irregular bounds are whatever is stored in span" begin
index = 10.0:10.0:50.0
dim = X(index; mode=Sampled(Ordered(), Irregular(0.0, 50000.0), Intervals(Start())))
@test bounds(dim) == (0.0, 50000.0)
end
end
end

@testset "Points bounds" begin
index = 10:15
dim = X(index; mode=Sampled(order=Ordered(), sampling=Points()))
@test bounds(dim) == (10, 15)
index = 15:-1:10
dim = X(index; mode=Sampled(order=Ordered(index=Reverse()), sampling=Points()))
last(dim), first(dim)
@test bounds(dim) == (10, 15)
dim = X(index; mode=Sampled(order=Unordered(), sampling=Points()))
@test_throws ErrorException bounds(dim)
end
@testset "Points" begin
index = 10:15
dim = X(index; mode=Sampled(order=Ordered(), sampling=Points()))
@test bounds(dim) == (10, 15)
index = 15:-1:10
dim = X(index; mode=Sampled(order=Ordered(index=Reverse()), sampling=Points()))
last(dim), first(dim)
@test bounds(dim) == (10, 15)
dim = X(index; mode=Sampled(order=Unordered(), sampling=Points()))
@test_throws ErrorException bounds(dim)
end

@testset "Categorical" begin
index = [:a, :b, :c, :d]
dim = X(index; mode=Categorical(; order=Ordered()))
@test bounds(dim) == (:a, :d)
dim = X(index; mode=Categorical(; order=Ordered(;index=Reverse())))
@test bounds(dim) == (:d, :a)
dim = X(index; mode=Categorical(; order=Unordered()))
@test_throws ErrorException bounds(dim)
end

@testset "Categorical bounds" begin
index = [:a, :b, :c, :d]
dim = X(index; mode=Categorical(; order=Ordered()))
@test bounds(dim) == (:a, :d)
dim = X(index; mode=Categorical(; order=Ordered(;index=Reverse())))
@test bounds(dim) == (:d, :a)
dim = X(index; mode=Categorical(; order=Unordered()))
@test_throws ErrorException bounds(dim)
end
28 changes: 21 additions & 7 deletions test/primitives.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,27 @@ da = DimensionalArray(a, (X((143, 145)), Y((-38, -36))))
dimz = dims(da)

@testset "slicedims" begin
@test slicedims(dimz, (1:2, 3)) ==
((X(LinRange(143,145,2), Sampled(Ordered(), Regular(2.0), Points()), nothing),),
(Y(-36.0, Sampled(Ordered(), Regular(1.0), Points()), nothing),))
@test slicedims(dimz, (2:2, :)) ==
((X(LinRange(145,145,1), Sampled(Ordered(), Regular(2.0), Points()), nothing),
Y(LinRange(-38.0,-36.0, 3), Sampled(Ordered(), Regular(1.0), Points()), nothing)), ())
@test slicedims((), (1:2, 3)) == ((), ())
@testset "Regular" begin
@test slicedims(dimz, (1:2, 3)) ==
((X(LinRange(143,145,2), Sampled(Ordered(), Regular(2.0), Points()), nothing),),
(Y(-36.0, Sampled(Ordered(), Regular(1.0), Points()), nothing),))
@test slicedims(dimz, (2:2, :)) ==
((X(LinRange(145,145,1), Sampled(Ordered(), Regular(2.0), Points()), nothing),
Y(LinRange(-38.0,-36.0, 3), Sampled(Ordered(), Regular(1.0), Points()), nothing)), ())
@test slicedims((), (1:2, 3)) == ((), ())
end
@testset "Irregular" begin
irreg = DimensionalArray(a, (X([140.0, 142.0]; mode=Sampled(Ordered(), Irregular(140.0, 144.0), Intervals(Start()))),
Y([10.0, 20.0, 40.0]; mode=Sampled(Ordered(), Irregular(0.0, 60.0), Intervals(Center()))), ))
irreg_dimz = dims(irreg)
@test slicedims(irreg, (1:2, 3)) ==
((X([140.0, 142.0], Sampled(Ordered(), Irregular(140.0, 144.0), Intervals(Start())), nothing),),
(Y(40.0, Sampled(Ordered(), Irregular(30.0, 60.0), Intervals(Center())), nothing),))
@test slicedims(irreg, (2:2, 1:2)) ==
((X([142.0], Sampled(Ordered(), Irregular(142.0, 144.0), Intervals(Start())), nothing),
Y([10.0, 20.0], Sampled(Ordered(), Irregular(0.0, 30.0), Intervals(Center())), nothing)), ())
@test slicedims((), (1:2, 3)) == ((), ())
end
end

@testset "dims2indices" begin
Expand Down

0 comments on commit 913b45a

Please sign in to comment.