Merge pull request #643 from JuliaStats/bythunk

exported HOFs all do thunk
JuliaData · Jul 8, 2014 · f8fc0ec · f8fc0ec
2 parents 1946ebe + 7f8afda
commit f8fc0ec
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/src/dataframe/reshape.jl b/src/dataframe/reshape.jl
@@ -101,7 +101,7 @@ end
 # `mean` is the default aggregation function:
 pivottable(df::AbstractDataFrame, rows, cols, value) = pivottable(df, rows, cols, value, mean)
 pivottable(df::AbstractDataFrame, rows, cols, value, fun) = pivottable(df, [index(df)[rows]], [index(df)[cols]], index(df)[value], fun)
-
+pivottable(fun::Function, df::AbstractDataFrame, rows, cols, value) = pivottable(df, rows, cols, value, fun)
 
 ##############################################################################
 ##

diff --git a/src/groupeddataframe/grouping.jl b/src/groupeddataframe/grouping.jl
@@ -199,5 +199,6 @@ Base.names(d::GroupedDataFrame) = names(d.parent)
 
 # by() convenience function
 by(d::AbstractDataFrame, cols, f::Function) = based_on(groupby(d, cols), f)
+by(f::Function, d::AbstractDataFrame, cols) = by(d, cols, f)
 by(d::AbstractDataFrame, cols, s::Vector{Symbol}) = colwise(groupby(d, cols), s)
 by(d::AbstractDataFrame, cols, s::Symbol) = colwise(groupby(d, cols), s)
diff --git a/src/other/index.jl b/src/other/index.jl
@@ -66,8 +66,10 @@ end
 rename!(x::Index, from, to) = rename!(x, zip(from, to))
 rename!(x::Index, from::Symbol, to::Symbol) = rename!(x, ((from, to),))
 rename!(x::Index, f::Function) = rename!(x, [(x,f(x)) for x in x.names])
+rename!(f::Function, x::Index) = rename!(x, f)
 
 rename(x::Index, args...) = rename!(copy(x), args...)
+rename(f::Function, x::Index) = rename(x, f)
 
 Base.haskey(x::Index, key::Symbol) = haskey(x.lookup, key)
 Base.haskey(x::Index, key::Real) = 1 <= key <= length(x.names)