Implement interface for Named Tuples

Author: meggart

src/YAXArrayBase.jl

@@ -4,6 +4,7 @@ using DataStructures: OrderedDict
 
 include("datasets/datasetinterface.jl")
 include("axisarrays/axisinterface.jl")
+include("axisarrays/namedtuple.jl")
 
 defaultfillval(T::Type{<:AbstractFloat}) = convert(T,1e32)
 defaultfillval(::Type{Float16}) = Float16(3.2e4)

src/axisarrays/axisinterface.jl

@@ -43,7 +43,7 @@ iscompressed(x) = false
 
 Returns a tuple of dimension names for al dimensions of x.
 """
-dimnames(x) = ntuple(i->dimname(x,i), ndims(x))
+dimnames(x) = ntuple(i->dimname(x,i), ndims(getdata(x)))
 
 """
     getattributes(x)
@@ -77,7 +77,8 @@ valfromaxis(x) = x
 Converts an AbstractArray x that implements the interface to type T.
 """
 function yaxconvert(T::Type{<:Any},x)
-  yaxcreate(T, getdata(x), dimnames(x),dimvals.(Ref(x),1:ndims(x)),getattributes(x))
+  data = getdata(x)
+  yaxcreate(T, data, dimnames(x),dimvals.(Ref(x),1:ndims(data)),getattributes(x))
 end
 
 """

src/axisarrays/namedtuple.jl

@@ -0,0 +1,17 @@
+dimvals(x::NamedTuple,i) = x.axes[i]
+
+_dname(::NamedTuple{N},i) where N = N[i]
+_dname(::Tuple,i) = Symbol("Dim_",i)
+dimname(x::NamedTuple, i) = _dname(x.axes,i)
+
+#Special method to get all dim names
+dimnames(x::NamedTuple) = _dnames(x.axes)
+_dnames(::NamedTuple{N}) where N = N
+_dnames(x) = ntuple(i->Symbol("Dim_",i), length(x))
+
+getdata(x::NamedTuple) = x.values
+
+function yaxcreate(::Type{<:NamedTuple},data,dnames,dvals,atts)
+  axes = NamedTuple{dnames}(dvals)
+  (axes = axes, values = data)
+end