Merge pull request #105 from mdavezac/constructor-issue-103

Constructor over an AxisArray

Author: ajkeller34

src/core.jl

@@ -210,6 +210,12 @@ function AxisArray(A::AbstractArray{T,N}, names::NTuple{N,Symbol}, steps::NTuple
     AxisArray(A, axs...)
 end
 
+AxisArray(A::AxisArray) = A
+AxisArray(A::AxisArray, ax::Vararg{Axis, N}) where N =
+    AxisArray(A.data, ax..., last(Base.IteratorsMD.split(axes(A), Val{N}))...)
+AxisArray(A::AxisArray, ax::NTuple{N, Axis}) where N =
+    AxisArray(A.data, ax..., last(Base.IteratorsMD.split(axes(A), Val{N}))...)
+
 # Traits
 struct HasAxes{B} end
 HasAxes(::Type{<:AxisArray}) = HasAxes{true}()

test/core.jl

@@ -145,6 +145,18 @@ A = @inferred(AxisArray(reshape(1:24, 2,3,4),
               Axis{:y}(1//10:1//10:3//10),
               Axis{:z}(["a", "b", "c", "d"])))
 
+# recursive constructor
+@test A === @inferred AxisArray(A)
+@test axisnames(AxisArray(A, Axis{:yoyo}(1:length(A[Axis{:x}])))) == (:yoyo, :y, :z)
+@test AxisArray(A, Axis{:yoyo}(1:length(A[Axis{:x}]))).data === A.data
+@test AxisArray(A, (Axis{:yoyo}(1:length(A[Axis{:x}])),)).data === A.data
+@test axisnames(AxisArray(A, :something, :in, :the)) == (:something, :in, :the)
+@test AxisArray(A, :way, :you, :move).data === A.data
+@test axisnames(AxisArray(A, (:c, :a, :b), (2, 3, 4))) == (:c, :a, :b)
+@test AxisArray(A, (:c, :a, :b), (2, 3, 4)).data === A.data
+@inferred AxisArray(A, Axis{:yoyo}(1:length(A[Axis{:x}])))
+@inferred AxisArray(A, (Axis{:yoyo}(1:length(A[Axis{:x}])),))
+
 # Test axisdim
 @test axisdim(A, Axis{:x}) == axisdim(A, Axis{:x}()) == 1
 @test axisdim(A, Axis{:y}) == axisdim(A, Axis{:y}()) == 2