recursive bottoming

Author: ChrisRackauckas

src/RecursiveArrayTools.jl

@@ -15,7 +15,8 @@ module RecursiveArrayTools
          vecarr_to_arr, vecarr_to_vectors, tuples
 
   export recursivecopy, recursivecopy!, vecvecapply, copyat_or_push!,
-         vecvec_to_mat, recursive_one, recursive_mean, recursive_eltype
+         vecvec_to_mat, recursive_one, recursive_mean, recursive_bottom_eltype,
+         recursive_unitless_bottom_eltype, recursive_unitless_eltype
 
   export ArrayPartition
 

src/utils.jl

@@ -92,8 +92,16 @@ end
 recursive_one(a) = recursive_one(a[1])
 recursive_one(a::T) where {T<:Number} = one(a)
 
-recursive_eltype(a) = recursive_eltype(eltype(a))
-recursive_eltype(a::Type{T}) where {T<:Number} = eltype(a)
+recursive_bottom_eltype(a) = recursive_bottom_eltype(eltype(a))
+recursive_bottom_eltype(a::Type{T}) where {T<:Number} = eltype(a)
+
+recursive_unitless_bottom_eltype(a) = recursive_unitless_bottom_eltype(eltype(a))
+recursive_unitless_bottom_eltype(a::Type{T}) where {T<:Number} = typeof(one(eltype(a)))
+
+Base.@pure recursive_unitless_eltype(a) = recursive_unitless_eltype(eltype(a))
+Base.@pure recursive_unitless_eltype{T<:StaticArray}(a::Type{T}) = similar_type(a,recursive_unitless_eltype(eltype(a)))
+Base.@pure recursive_unitless_eltype{T<:Array}(a::Type{T}) = Array{recursive_unitless_eltype(eltype(a)),ndims(a)}
+Base.@pure recursive_unitless_eltype{T<:Number}(a::Type{T}) = typeof(one(eltype(a)))
 
 recursive_mean(x...) = mean(x...)
 function recursive_mean(vecvec::Vector{T}) where T<:AbstractArray

test/utils_test.jl

@@ -1,5 +1,5 @@
 using OrdinaryDiffEq, ParameterizedFunctions,
-      DiffEqBase, RecursiveArrayTools
+      DiffEqBase, RecursiveArrayTools, Unitful, StaticArrays
 using Base.Test
 
 # Here's the problem to solve
@@ -35,3 +35,18 @@ ans = [[1 2; 3 4],[1 4; 4 4.5],[5 7; 4.5 4.5]]
 ans = [[2.333333333333 4.666666666666; 3.6666666666666 6.0], [2.3333333 3.0; 5.0 2.6666666]]
 @test recursive_mean(B,2)[1] ≈ ans[1]
 @test recursive_mean(B,2)[2] ≈ ans[2]
+
+A = zeros(5,5)
+recursive_unitless_eltype(A) == Float64
+A = zeros(5,5)*1u"kg"
+recursive_unitless_eltype(A) == Float64
+AA = [zeros(5,5) for i in 1:5]
+recursive_unitless_eltype(AA) == Array{Float64,2}
+AofA = [copy(A) for i in 1:5]
+recursive_unitless_eltype(AofA) == Array{Float64,2}
+AofSA = [@SVector [2.0,3.0] for i in 1:5]
+recursive_unitless_eltype(AofSA) == SVector{2,Float64}
+AofuSA = [@SVector [2.0u"kg",3.0u"kg"] for i in 1:5]
+recursive_unitless_eltype(AofuSA) == SVector{2,Float64}
+
+@inferred recursive_unitless_eltype(AofuSA)