Skip to content

Commit

Permalink
Merge pull request #7 from panlanfeng/list_show
Browse files Browse the repository at this point in the history
update List show method
  • Loading branch information
panlanfeng committed Sep 23, 2016
2 parents dd9efb8 + 1b55392 commit 1ef2ed1
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
17 changes: 10 additions & 7 deletions src/List.jl
Original file line number Diff line number Diff line change
Expand Up @@ -142,21 +142,24 @@ List(A::Matrix)=convert(List, A)
List(df::DataFrames.AbstractDataFrame) = convert(List, df)

function show(io::IO, d::List)
print(io, showindent(d))
showindent(io, d)
end
function showindent(d::List, indent::String="")

function showindent(io::IO, d::List, indent::String="")
k = _names(d.colindex)
res=sprint(println, indent, "$(length(d)) elements List:")
println(io, indent, "$(length(d)) elements List:")
for i in 1:length(d.columns)
res*=sprint(println, indent, "[$i] ", k[i], ": ")
println(io, indent, "[$i] ", k[i], ": ")
if isa(d.columns[i], List)
indent2 = indent*" "
res*=sprint(println, indent, showindent(d.columns[i], indent2))
print(io, indent)
showindent(io, d.columns[i], indent2)
else
res*=sprint(println, indent, " ", d.columns[i])
print(io, indent, " ")
show(io, d.columns[i])
println(io)
end
end
res
end

index(df::List) = df.colindex
Expand Down
2 changes: 1 addition & 1 deletion test/Listtest.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using DataFrames, StatsBase

li = list(x=rand(10), y = rand(Int, 2,3), df = DataFrame(rand(5,2)),
li = list(x=rand(100), y = rand(Int, 2,3), df = DataFrame(rand(5,2)),
fa = pool(sample([true, false], 100)))

li2 = merge(li, list(f1=*, f2=-))
Expand Down

0 comments on commit 1ef2ed1

Please sign in to comment.