add support for Dates

Author: mbauman

src/core.jl

@@ -558,3 +558,11 @@ _size(A::AbstractArray) = map(length, indices(A))
 _size(A) = size(A)
 _size(A::AbstractArray, d) = length(indices(A, d))
 _size(A, d) = size(A, d)
+
+Base.flipdim(A::AxisArray, d::Integer) = flipdim(A, A.axes[d])
+Base.flipdim(A::AxisArray, ax::Axis) = flipdim(A, typeof(ax))
+Base.flipdim{T<:Axis}(A::AxisArray, ::Type{T}) = AxisArray(flipdim(A.data, axisdim(A, T)), flipax(A.axes, T)...)
+flipax(::Tuple{}, ::Type) = ()
+flipax{T,X,Y}(t::Tuple{Axis{T,X}, Vararg{Any}}, ::Type{Axis{T,Y}}) = (Axis{T}(flipdim(t[1].val, 1)), tail(t)...)
+flipax{S,X}(t::Tuple{Axis{S,X}, Vararg{Any}},   ::Type{Axis{S}})   = (Axis{T}(flipdim(t[1].val, 1)), tail(t)...)
+flipax{T}(t::Tuple, ::Type{T}) = (t[1], flipax(tail(t), T)...)

src/indexing.jl

@@ -199,7 +199,11 @@ axisindexes{T}(::Type{Dimensional}, ax::AbstractVector{T}, idx::ClosedInterval)
 # (the fencepost problem). As such, we need to be careful about how and when we
 # snap the provided intervals and offsets to exact axis values (and indices).
 # 
-# 
+# Note that this is fundamentally different than indexing by a single interval;
+# whereas those intervals are specified in the same units as the elements of the
+# axis itself, repeated intervals are specified in terms of _offsets_. This is
+# most obvious with dates; single intervals are between dates, repeated
+# intervals use intervals of days (for example) and offsets of dates.
 axisindexes(::Type{Dimensional}, ax::AbstractVector, idx::RepeatedInterval) = error("repeated intervals might select a varying number of elements for non-range axes; use a repeated Range of indices instead")
 function axisindexes(::Type{Dimensional}, ax::Range, idx::RepeatedInterval)
     idxs, vals = relativewindow(ax, idx.window)

src/search.jl

@@ -25,12 +25,16 @@ function unsafe_searchsortednearest(vec::Range, x)
 end
 
 
-nsteps(x, step) = floor(Int, abs(x / step)) * Int(sign(x))
+function nsteps(x, step)
+    offset = floor(Int, abs(x / step))
+    return x < zero(x) ? -offset : offset
+end
 function nsteps{T}(x, step::Base.TwicePrecision{T})
     # this is basically a hack because Base hasn't defined x/step at TwicePrecision resolution
     nf = abs(x / convert(T, step))
     nc = ceil(Int, nf)
-    return (abs(convert(T, nc*step)) <= abs(x) ? nc : floor(Int, nf)) * Int(sign(x))
+    offset = (abs(convert(T, nc*step)) <= abs(x) ? nc : floor(Int, nf))
+    return x < zero(x) ? -offset : offset
 end
 
 _step(r::Range) = step(r)

test/indexing.jl

@@ -121,7 +121,6 @@ Base.div(x::IntLike, y::IntLike) = div(x.val, y.val)
 Base.:*(x::IntLike, y::Int) = IntLike(x.val * y)
 Base.:*(x::Int, y::IntLike) = y*x
 Base.:/(x::IntLike, y::Int) = IntLike(x.val / y)
-Base.abs(x::IntLike) = IntLike(abs(x.val))
 Base.promote_rule(::Type{IntLike}, ::Type{Int}) = Int
 Base.convert(::Type{Int}, x::IntLike) = x.val
 using AxisArrays
@@ -180,3 +179,17 @@ A = AxisArray(rand(2,2), :x, :y)
 acc = zeros(Int, 4, 1, 2)
 Base.mapreducedim!(x->x>5, +, acc, A3)
 @test acc == reshape([1 3; 2 3; 2 3; 2 3], 4, 1, 2)
+
+# Test using dates
+using Base.Dates: Day, Month
+A = AxisArray(1:365, Date(2017,1,1):Date(2017,12,31))
+@test A[Date(2017,2,1) .. Date(2017,2,28)] == collect(31 + (1:28)) # February
+@test A[(-Day(13)..Day(14)) + Date(2017,2,14)] == collect(31 + (1:28))
+@test A[(-Day(14)..Day(14)) + DateTime(2017,2,14,12)] == collect(31 + (1:28))
+@test A[(Day(0)..Day(6)) + (Date(2017,1,1):Month(1):Date(2017,4,12))] == [1:7 32:38 60:66 91:97]
+
+B = flipdim(A, 1)
+@test B[Date(2017,2,1) .. Date(2017,2,28)] == collect(31 + (1:28)) # February
+@test B[(-Day(13)..Day(14)) + Date(2017,2,14)] == collect(31 + (1:28))
+@test B[(-Day(14)..Day(14)) + DateTime(2017,2,14,12)] == collect(31 + (1:28))
+@test B[(Day(0)..Day(6)) + (Date(2017,1,1):Month(1):Date(2017,4,12))] == [1:7 32:38 60:66 91:97]