fix type piracy

Author: ChrisRackauckas

src/RecursiveArrayTools.jl

@@ -4,15 +4,14 @@ module RecursiveArrayTools
 
   using Iterators
 
-  import Base: mean
-
   include("utils.jl")
   include("vector_of_array.jl")
   include("array_partition.jl")
 
   export VectorOfArray, AbstractVectorOfArray, vecarr_to_arr
 
-  export recursivecopy!, vecvecapply, copyat_or_push!, vecvec_to_mat, recursive_one,mean
+  export recursivecopy!, vecvecapply, copyat_or_push!, vecvec_to_mat, recursive_one,
+         recursive_mean
 
   export ArrayPartition
 

src/utils.jl

@@ -66,24 +66,25 @@ end
 recursive_one(a) = recursive_one(a[1])
 recursive_one{T<:Number}(a::T) = one(a)
 
-function mean{T<:AbstractArray}(vecvec::Vector{T})
+recursive_mean(x) = mean(x)
+function recursive_mean{T<:AbstractArray}(vecvec::Vector{T})
   out = zeros(vecvec[1])
   for i in eachindex(vecvec)
     out+= vecvec[i]
   end
   out/length(vecvec)
 end
 
-function mean{T<:AbstractArray}(matarr::Matrix{T},region=0)
+function recursive_mean{T<:AbstractArray}(matarr::Matrix{T},region=0)
   if region == 0
-    return mean(vec(matarr))
+    return recursive_mean(vec(matarr))
   elseif region == 1
     out = [zeros(matarr[1,i]) for i in 1:size(matarr,2)]
     for j in 1:size(matarr,2), i in 1:size(matarr,1)
       out[j] += matarr[i,j]
     end
     return out/size(matarr,1)
   elseif region == 2
-    return mean(matarr',1)
+    return recursive_mean(matarr',1)
   end
 end

test/utils_test.jl

@@ -21,17 +21,17 @@ data = vecvec_to_mat(randomized)
 
 ## Test means
 A = [[1 2; 3 4],[1 3;4 6],[5 6;7 8]]
-@test mean(A) ≈ [2.33333333 3.666666666
+@test recursive_mean(A) ≈ [2.33333333 3.666666666
            4.6666666666 6.0]
 B = Matrix{Matrix{Int64}}(2,3)
 B[1,:] = [[1 2; 3 4],[1 3;4 6],[5 6;7 8]]
 B[2,:] = [[1 2; 3 4],[1 5;4 3],[5 8;2 1]]
 
 ans = [[1 2; 3 4],[1 4; 4 4.5],[5 7; 4.5 4.5]]
-@test mean(B,1)[1] ≈ ans[1]
-@test mean(B,1)[2] ≈ ans[2]
-@test mean(B,1)[3] ≈ ans[3]
+@test recursive_mean(B,1)[1] ≈ ans[1]
+@test recursive_mean(B,1)[2] ≈ ans[2]
+@test recursive_mean(B,1)[3] ≈ ans[3]
 
 ans = [[2.333333333333 4.666666666666; 3.6666666666666 6.0], [2.3333333 3.0; 5.0 2.6666666]]
-@test mean(B,2)[1] ≈ ans[1]
-@test mean(B,2)[2] ≈ ans[2]
+@test recursive_mean(B,2)[1] ≈ ans[1]
+@test recursive_mean(B,2)[2] ≈ ans[2]