Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Show group values when printing grouped dataframe #1632

Merged
merged 9 commits into from Dec 26, 2018
Merged

Show group values when printing grouped dataframe #1632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1b2798d
Show group values when printing grouped dataframe
pdeffebach Dec 12, 2018
ff0b463
less repeat code
Dec 13, 2018
84ff9ba
fix indentation
Dec 13, 2018
2762f10
Put all on one line
pdeffebach Dec 14, 2018
461d345
Respond to comments
pdeffebach Dec 20, 2018
8a6301d
whitespace
pdeffebach Dec 20, 2018
3978895
small fixes
pdeffebach Dec 20, 2018
43e8378
Test fixes
pdeffebach Dec 20, 2018
085e672
fix to avoid rebase
pdeffebach Dec 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 25 additions & 5 deletions src/groupeddataframe/show.jl
View file
Open in desktop
Expand Up @@ -6,31 +6,51 @@ function Base.show(io::IO, gd::GroupedDataFrame;
rowlabel::Symbol = :Row,
summary::Bool = true)
N = length(gd)
keys = join(':' .* string.(names(gd.parent)[gd.cols]), ", ")
keynames = names(gd.parent)[gd.cols]
parent_names = names(gd.parent)
keys = join(':' .* string.(keynames), ", ")

keystr = length(gd.cols) > 1 ? "keys" : "key"
groupstr = N > 1 ? "groups" : "group"
summary && print(io, "$(typeof(gd)) with $N $groupstr based on $keystr: $keys")
if allgroups
for i = 1:N
nrows = size(gd[i], 1)
rows = nrows > 1 ? "rows" : "row"
print(io, "\nGroup $i: $nrows $rows")

identified_groups = [':' * string(parent_names[col], " = ", first(gd[i][col]))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've just realized that when the grouping column is a string or symbol, it's printed as e.g. :x = a rather than :x = "a" or :x = :a. I guess we should change this (using repr or ourshowcompact)?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be repr. I will make a quick PR.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1684

for col in gd.cols]

print(io, "\nGroup $i ($nrows $rows): ")
join(io, identified_groups, ", ")

show(io, gd[i], summary=false,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we shouldn't print the grouping columns, since they're listed above?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it reads well.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As you like. But just to make sure we're talking about the same thing: I was suggesting we could drop the grouping columns from the data frame we print below, since all values are equal within a given group.

allrows=allrows, allcols=allcols, rowlabel=rowlabel)
end
else
if N > 0
nrows = size(gd[1], 1)
rows = nrows > 1 ? "rows" : "row"
print(io, "\nFirst Group: $nrows $rows")

identified_groups = [':' * string(parent_names[col], " = ", first(gd[1][col]))
for col in gd.cols]

print(io, "\nFirst Group ($nrows $rows): ")
join(io, identified_groups, ", ")

show(io, gd[1], summary=false,
allrows=allrows, allcols=allcols, rowlabel=rowlabel)
end
if N > 1
print(io, "\n⋮\n")
nrows = size(gd[N], 1)
rows = nrows > 1 ? "rows" : "row"
print(io, "Last Group: $nrows $rows")

identified_groups = [':' * string(parent_names[col], " = ", first(gd[N][col]))
for col in gd.cols]
print(io, "\n⋮")
print(io, "\nLast Group ($nrows $rows): ")
join(io, identified_groups, ", ")

show(io, gd[N], summary=false,
allrows=allrows, allcols=allcols, rowlabel=rowlabel)
end
Expand Down
12 changes: 6 additions & 6 deletions test/show.jl
View file
Open in desktop
Expand Up @@ -235,13 +235,13 @@ module TestShow
str = String(take!(io.io))
@test str == """
GroupedDataFrame{DataFrame} with 4 groups based on key: :A
First Group: 1 row
First Group (1 row): :A = 1
│ Row │ A │ B │ C │
│ │ Int64 │ String │ Float32 │
├─────┼───────┼────────┼─────────┤
│ 1 │ 1 │ x" │ 1.0 │
⋮
Last Group: 1 row
Last Group (1 row): :A = 4
│ Row │ A │ B │ C │
│ │ Int64 │ String │ Float32 │
├─────┼───────┼────────┼─────────┤
Expand All @@ -250,22 +250,22 @@ module TestShow
str = String(take!(io.io))
@test str == """
GroupedDataFrame{DataFrame} with 4 groups based on key: :A
Group 1: 1 row
Group 1 (1 row): :A = 1
│ Row │ A │ B │ C │
│ │ Int64 │ String │ Float32 │
├─────┼───────┼────────┼─────────┤
│ 1 │ 1 │ x\" │ 1.0 │
Group 2: 1 row
Group 2 (1 row): :A = 2
│ Row │ A │ B │ C │
│ │ Int64 │ String │ Float32 │
├─────┼───────┼─────────────┼─────────┤
│ 1 │ 2 │ ∀ε>0: x+ε>x │ 2.0 │
Group 3: 1 row
Group 3 (1 row): :A = 3
│ Row │ A │ B │ C │
│ │ Int64 │ String │ Float32 │
├─────┼───────┼────────┼─────────┤
│ 1 │ 3 │ z\$ │ 3.0 │
Group 4: 1 row
Group 4 (1 row): :A = 4
│ Row │ A │ B │ C │
│ │ Int64 │ String │ Float32 │
├─────┼───────┼────────┼─────────┤
Expand Down