Merge pull request #785 from JuliaStats/desc

Accept AbstractVector in describe()
JuliaData · Mar 19, 2015 · 41ae997 · 41ae997
2 parents 86dbb00 + 48f5c27
commit 41ae997
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/src/abstractdataframe/abstractdataframe.jl b/src/abstractdataframe/abstractdataframe.jl
@@ -44,7 +44,7 @@ column is selected, just the column object is returned. If multiple
 columns are selected, some AbstractDataFrame is returned.
 
 ```julia
-d[:colA] 
+d[:colA]
 d[3]
 d[[:colA, :colB]]
 d[[1:3; 5]]
@@ -402,16 +402,16 @@ function describe(io, df::AbstractDataFrame)
         println(io, )
     end
 end
-describe(dv::AbstractDataVector) = describe(STDOUT, dv)
-function describe{T<:Number}(io, dv::AbstractDataVector{T})
+describe(dv::AbstractVector) = describe(STDOUT, dv)
+function describe{T<:Number}(io, dv::AbstractVector{T})
     if all(isna(dv))
         println(io, " * All NA * ")
         return
     end
     filtered = float(dropna(dv))
     qs = quantile(filtered, [0, .25, .5, .75, 1])
     statNames = ["Min", "1st Qu.", "Median", "Mean", "3rd Qu.", "Max"]
-    statVals = [qs[1:3], mean(filtered), qs[4:5]]
+    statVals = [qs[1:3]; mean(filtered); qs[4:5]]
     for i = 1:6
         println(io, string(rpad(statNames[i], 8, " "), " ", string(statVals[i])))
     end
@@ -420,7 +420,7 @@ function describe{T<:Number}(io, dv::AbstractDataVector{T})
     println(io, "NA%      $(round(nas*100/length(dv), 2))%")
     return
 end
-function describe{T}(io, dv::AbstractDataVector{T})
+function describe{T}(io, dv::AbstractVector{T})
     ispooled = isa(dv, PooledDataVector) ? "Pooled " : ""
     # if nothing else, just give the length and element type and NA count
     println(io, "Length  $(length(dv))")

diff --git a/test/dataframe.jl b/test/dataframe.jl
@@ -281,4 +281,19 @@ module TestDataFrame
     df = DataFrame(a=@data([1, 2, 3]), b=@data([3., 4., 5.]))
     @test deleterows!(df, [2, 3]) === df
     @test isequal(df, DataFrame(a=@data([1]), b=@data([3.])))
+
+    # describe
+    #suppress output and test that describe() does not throw
+    devnull = @unix? "/dev/null" : "nul"
+    open(devnull, "w") do f
+        @test nothing == describe(f, DataFrame(a=[1, 2], b=Any["3", NA]))
+        @test nothing == describe(f, DataFrame(a=@data([1, 2]), b=@data(["3", NA])))
+        @test nothing == describe(f, DataFrame(a=@pdata([1, 2]), b=@pdata(["3", NA])))
+        @test nothing == describe(f, [1, 2, 3])
+        @test nothing == describe(f, @data([1, 2, 3]))
+        @test nothing == describe(f, @pdata([1, 2, 3]))
+        @test nothing == describe(f, Any["1", "2", NA])
+        @test nothing == describe(f, @data(["1", "2", NA]))
+        @test nothing == describe(f, @pdata(["1", "2", NA]))
+    end
 end