Merge pull request #17 from JuliaDataCubes/fg/axisindices

fix axisindices

Author: meggart

src/axisarrays/axisindices.jl

@@ -2,7 +2,7 @@ using .AxisIndices: AbstractAxis,AxisIndices
 
 valfromaxis(ax::AbstractAxis) = keys(ax)
 
-getdata(a::AxisIndices.AxisArray) = parent(a)
+getdata(a::AxisIndices.AxisIndicesArray) = parent(a)
 
-yaxcreate(::Type{<:AxisIndices.AxisArray}, data, dnames, dvals, atts) =
-  AxisIndices.AxisArray(data, map(i->dvals[i], 1:ndims(data))...)
+yaxcreate(::Type{<:AxisIndices.AxisIndicesArray}, data, dnames, dvals, atts) =
+  AxisIndices.AxisIndicesArray(data, (dvals...,))

test/arrays.jl

@@ -10,8 +10,8 @@ YAXArrayBase.getattributes(::M) = Dict{String,Any}("a1"=>5, "a2"=>"att")
 
 @testset "AxisIndices" begin
     using AxisIndices: AxisIndices
-    d = yaxconvert(AxisIndices.AxisArray,M())
-    @test d isa AxisIndices.AxisArray
+    d = yaxconvert(AxisIndices.AxisIndicesArray,M())
+    @test d isa AxisIndices.AxisIndicesArray
     @test getdata(d) == reshape(1:12,3,4)
     @test YAXArrayBase.dimnames(d) == (:Dim_1, :Dim_2)
     @test dimvals(d,1) == 0.5:1.0:2.5