Fix test failures on master

Use vcat() instead of collect() in colwise(), and identity() instead of abs(), since the latter do not work with Nullable.
JuliaData · Sep 27, 2016 · 786414c · 786414c
1 parent 5998148
commit 786414c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/groupeddataframe/grouping.jl b/src/groupeddataframe/grouping.jl
@@ -304,12 +304,12 @@ colwise(sum, groupby(df, :a))
 ```
 
 """
-colwise(f::Function, d::AbstractDataFrame) = Any[collect(f(d[idx])) for idx in 1:size(d, 2)]
+colwise(f::Function, d::AbstractDataFrame) = Any[vcat(f(d[idx])) for idx in 1:size(d, 2)]
 colwise(f::Function, gd::GroupedDataFrame) = map(colwise(f), gd)
 colwise(f::Function) = x -> colwise(f, x)
 colwise(f) = x -> colwise(f, x)
 # apply several functions to each column in a DataFrame
-colwise{T<:Function}(fns::Vector{T}, d::AbstractDataFrame) = Any[collect(f(d[idx])) for f in fns, idx in 1:size(d, 2)][:]
+colwise{T<:Function}(fns::Vector{T}, d::AbstractDataFrame) = Any[vcat(f(d[idx])) for f in fns, idx in 1:size(d, 2)][:]
 colwise{T<:Function}(fns::Vector{T}, gd::GroupedDataFrame) = map(colwise(fns), gd)
 colwise{T<:Function}(fns::Vector{T}) = x -> colwise(fns, x)
 

diff --git a/test/data.jl b/test/data.jl
@@ -99,7 +99,7 @@ module TestData
     end
     @test isequal(res, sum(df7[:d1]))
 
-    @test aggregate(DataFrame(a=1),abs) == DataFrame(a_abs=1)
+    @test aggregate(DataFrame(a=1), identity) == DataFrame(a_identity=1)
 
     df8 = aggregate(df7[[1, 3]], sum)
     @test isequal(df8[1, :d1_sum], sum(df7[:d1]))