Merge pull request #67 from JuliaArrays/teh/cartindex

Fix CartesianIndex indexing (fix #62 #66)

Author: mbauman

src/indexing.jl

@@ -197,22 +197,27 @@ end
 # set- and get- index.
 @generated function to_index{T,N,D,Ax}(A::AxisArray{T,N,D,Ax}, I...)
     ex = Expr(:tuple)
+    n = 0
     for i=1:length(I)
         if I[i] <: Idx
             push!(ex.args, :(I[$i]))
+            n += 1
         elseif I[i] <: AbstractArray{Bool}
             push!(ex.args, :(find(I[$i])))
+            n += 1
         elseif I[i] <: CartesianIndex
             for j = 1:length(I[i])
                 push!(ex.args, :(I[$i][$j]))
             end
+            n += length(I[i])
         elseif i <= length(Ax.parameters)
             push!(ex.args, :(axisindexes(A.axes[$i], I[$i])))
+            n += 1
         else
             push!(ex.args, :(error("dimension ", $i, " does not have an axis to index")))
         end
     end
-    for _=length(I)+1:N
+    for _=n+1:N
         push!(ex.args, :(Colon()))
     end
     meta = Expr(:meta, :inline)

test/indexing.jl

@@ -129,11 +129,15 @@ for (r, Irel) in ((0.1:0.1:10.0, -0.5..0.5),  # FloatRange
     @test_throws BoundsError A[atindex(Irel, [5, 15, 25]), :]
 end
 
-# Indexing with CartesianIndex{0}
+# Indexing with CartesianIndex
 A = AxisArray(reshape(1:15, 3, 5), :x, :y)
 @test A[2,2,CartesianIndex(())] == 5
 @test A[2,CartesianIndex(()),2] == 5
 @test A[CartesianIndex(()),2,2] == 5
+A3 = AxisArray(reshape(1:24, 4, 3, 2), :x, :y, :z)
+@test A3[2,CartesianIndex(2,2)] == 18
+@test A3[CartesianIndex(2,2),2] == 18
+@test A3[CartesianIndex(2,2,2)] == 18
 
 # Extracting the full axis
 axx = @inferred(A[Axis{:x}])
@@ -148,3 +152,11 @@ axy = @inferred(A[Axis{:y}])
 A = AxisArray(rand(2,2), :x, :y)
 @test_throws ArgumentError A[Axis{:x}(1), Axis{:x}(1)]
 @test_throws ArgumentError A[Axis{:y}(1), Axis{:y}(1)]
+
+# Reductions (issues #66, #62)
+@test maximum(A3, 1) == reshape([4 16; 8 20; 12 24], 1, 3, 2)
+@test maximum(A3, 2) == reshape([9 21; 10 22; 11 23; 12 24], 4, 1, 2)
+@test maximum(A3, 3) == reshape(A3[:,:,2], 4, 3, 1)
+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)