Change reduce{D}(...) to reducedim{D}(...) to extend Base.reducedim

Author: wsshin

src/StaticArrays.jl

@@ -3,12 +3,12 @@ __precompile__()
 module StaticArrays
 
 import Base: @pure, @propagate_inbounds, getindex, setindex!, size, similar,
-             length, convert, promote_op, map, map!, reduce, mapreduce,
-             broadcast, broadcast!, conj, transpose, ctranspose, hcat, vcat,
-             ones, zeros, eye, one, cross, vecdot, reshape, fill, fill!, det,
-             inv, eig, eigvals, trace, vecnorm, norm, dot, diagm, sum, prod,
-             count, any, all, sumabs, sumabs2, minimum, maximum, extrema, mean,
-             copy, diff
+             length, convert, promote_op, map, map!, reduce, reducedim,
+             mapreduce, broadcast, broadcast!, conj, transpose, ctranspose,
+             hcat, vcat, ones, zeros, eye, one, cross, vecdot, reshape, fill,
+             fill!, det, inv, eig, eigvals, trace, vecnorm, norm, dot, diagm,
+             sum, diff, prod, count, any, all, sumabs, sumabs2, minimum,
+             maximum, extrema, mean, copy
 
 export StaticScalar, StaticArray, StaticVector, StaticMatrix
 export Scalar, SArray, SVector, SMatrix

src/mapreduce.jl

@@ -90,13 +90,13 @@ end
     end
 end
 
-@generated function reduce{D}(op, a::StaticArray, ::Type{Val{D}})
+@generated function reducedim{D}(op, a::StaticArray, ::Type{Val{D}})
     S = size(a)
     if S[D] == 1
         return :(return a)
     else
         N = ndims(a)
-        Snew = ([n==D ? 1:S[n] for n = 1:N]...)
+        Snew = ([n==D ? 1 : S[n] for n = 1:N]...)
         newtype = similar_type(a, Snew)
 
         exprs = Array{Expr}(Snew)
@@ -131,8 +131,8 @@ end
 @inline sumabs2{T}(a::StaticArray{T}) = mapreduce(abs2, +, zero(T), a)
 @inline minimum(a::StaticArray) = reduce(min, a) # base has mapreduce(idenity, scalarmin, a)
 @inline maximum(a::StaticArray) = reduce(max, a) # base has mapreduce(idenity, scalarmax, a)
-@inline minimum{D}(a::StaticArray, dim::Type{Val{D}}) = reduce(min, a, dim)
-@inline maximum{D}(a::StaticArray, dim::Type{Val{D}}) = reduce(max, a, dim)
+@inline minimum{D}(a::StaticArray, dim::Type{Val{D}}) = reducedim(min, a, dim)
+@inline maximum{D}(a::StaticArray, dim::Type{Val{D}}) = reducedim(max, a, dim)
 
 @generated function diff{D}(a::StaticArray, ::Type{Val{D}}=Val{1})
     S = size(a)