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

Changes from 4 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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions src/groupeddataframe/show.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
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]), ", ")
grouped_names = names(gd.parent)[gd.cols]
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
grouped_names = names(gd.parent)[gd.cols]
keynames = names(gd.parent)[gd.cols]

parent_names = names(gd.parent)
keys = join(':' .* string.(grouped_names), ", ")

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])) for col in gd.cols]
Copy link
Member

Choose a reason for hiding this comment

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

Wrong indentation. Please also remove trailing spaces (here and elsewhere).

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 couldn't find any examples of the right indentation for constructors. So I added more line breaks? Let me know the course of action.

Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure there's a clear rule for comprehensions, but here first is inside string, so it should definitely not be aligned with the bracket. I'd do this:

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


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

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, ", ", " and ")

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, "\nLast group ($nrows $rows): ")
join(io, identified_groups, ", ", " and ")

show(io, gd[N], summary=false,
allrows=allrows, allcols=allcols, rowlabel=rowlabel)
end
Expand Down