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

Print list-column dims #4154

Merged
merged 6 commits into from
Jan 3, 2020
Merged

Print list-column dims #4154

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e13e8b3
add list-column dims to print
Dec 31, 2019
2367b01
added tests for printing list-column dims
Dec 31, 2019
7649793
fix tests that print list-columns with dimensions
Dec 31, 2019
0f47bc4
added print for list-column dimension for s4 classes
Jan 2, 2020
871d8fe
Merge branch 'master' into print-list-dims
mattdowle Jan 3, 2020
f6d6960
tidy and added news item
mattdowle Jan 3, 2020
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
12 changes: 11 additions & 1 deletion R/print.data.table.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ format.data.table = function (x, ..., justify="none", timezone = FALSE) {
else if (is.atomic(x) || inherits(x,"formula")) # FR #2591 - format.data.table issue with columns of class "formula"
paste(c(format(head(x, 6L), justify=justify, ...), if (length(x) > 6L) "..."), collapse=",") # fix for #5435 - format has to be added here...
else
paste0("<", class(x)[1L], ">")
paste0("<", class(x)[1L], paste_dims(x), ">")
}
# FR #2842 add timezone for posix timestamps
format.timezone = function(col) { # paste timezone to a time object
Expand Down Expand Up @@ -189,6 +189,16 @@ shouldPrint = function(x) {
# as opposed to printing a blank line, for excluding col.names per PR #1483
cut_top = function(x) cat(capture.output(x)[-1L], sep = '\n')

# for printing the dims for list columns #3671
# is used in format.data.table()
paste_dims = function(x) {
dims = dim(x)
if (is.null(dims))
dims = length(x)
dims = paste(dims, collapse="x")
paste0("[", dims, "]")
}

# to calculate widths of data.table for PR #4074
# gets the width of the data.table at each column
# and compares it to the console width
Expand Down
39 changes: 30 additions & 9 deletions inst/tests/tests.Rraw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1631,7 +1631,7 @@ test(557, DT[, f(.SD), by=x], error="[.]SD is locked.*reserved for possible futu
# Test printing on nested data.table, bug #1803
DT = data.table(x=letters[1:3], y=list(1:10, letters[1:4], data.table(a=1:3,b=4:6)))
test(558, capture.output(print(DT)),
c(" x y", "1: a 1,2,3,4,5,6,...", "2: b a,b,c,d", "3: c <data.table>"))
c(" x y", "1: a 1,2,3,4,5,6,...", "2: b a,b,c,d", "3: c <data.table[3x2]>"))
test(559, setkey(DT,x)["a",y][[1]], 1:10) # y is symbol representing list column, specially detected in dogroups

# Test renaming of .N to N
Expand Down Expand Up @@ -8280,11 +8280,11 @@ DT1 = data.table(lcol = list(list(1:3), list(1:3), list(1:3)),
xcol = as.complex(icol), ocol = factor(icol, ordered = TRUE),
fcol = factor(icol))
test(1610.1, capture.output(print(DT1, class=TRUE)),
c(" lcol icol ncol ccol xcol ocol fcol",
" <list> <int> <num> <char> <cplx> <ord> <fctr>",
"1: <list> 1 1 a 1+0i 1 1",
"2: <list> 2 2 b 2+0i 2 2",
"3: <list> 3 3 c 3+0i 3 3"))
c(" lcol icol ncol ccol xcol ocol fcol",
" <list> <int> <num> <char> <cplx> <ord> <fctr>",
"1: <list[1]> 1 1 a 1+0i 1 1",
"2: <list[1]> 2 2 b 2+0i 2 2",
"3: <list[1]> 3 3 c 3+0i 3 3"))
DT2 = data.table(
Dcol = as.Date('2016-01-01') + 0:2,
Pcol = as.POSIXct('2016-01-01 01:00:00', tz = 'UTC') + 86400L*(0:2),
Expand Down Expand Up @@ -8872,13 +8872,13 @@ test(1635.2, fread(text, fill=TRUE), setnames(ans1[, 1:7], c(letters[1:5], paste
# testing function type in dt, #518
dt = data.table(x=1, y=sum)
test(1636.1, class(dt$y), "list")
test(1636.2, any(grepl("1: 1 <function>", capture.output(print(dt)))), TRUE)
test(1636.2, any(grepl("1: 1 <function\\[1\\]>", capture.output(print(dt)))), TRUE)
TysonStanley marked this conversation as resolved.
Show resolved Hide resolved
dt = data.table(x=1:2, y=sum)
test(1636.3, class(dt$y), "list")
test(1636.4, any(grepl("2: 2 <function>", capture.output(print(dt)))), TRUE)
test(1636.4, any(grepl("2: 2 <function\\[1\\]>", capture.output(print(dt)))), TRUE)
dt = data.table(x=1:2, y=c(sum, min))
test(1636.5, class(dt$y), "list")
test(1636.6, any(grepl("2: 2 <function>", capture.output(print(dt)))), TRUE)
test(1636.6, any(grepl("2: 2 <function\\[1\\]>", capture.output(print(dt)))), TRUE)

# #484 fix (related to #495 fix above)
dt = data.table(a = 1, b = 1)
Expand Down Expand Up @@ -16708,6 +16708,27 @@ A = data.table(c1 = 1, c2 = 'asd', c3 = expression(as.character(Sys.time())))
B = data.table(c1 = 3, c2 = 'qwe', c3 = expression(as.character(Sys.time()+5)))
test(2129, rbind(A,B)$c3, expression(as.character(Sys.time()), as.character(Sys.time()+5)))

# print dims in list-columns #3671
DT = data.table::data.table(
x = 1:2,
y = list(data.table(x = 1,
y = 1),
data.table(x = 2,
y = 2)))
test(2130.01, capture.output(print(DT)),
c(" x y",
"1: 1 <data.table[1x2]>",
"2: 2 <data.table[1x2]>"))
DT = data.table::data.table(
x = 1:2,
y = list(list(x = 1,
y = c("yes", "no")),
list(x = 2,
y = 2)))
test(2130.02, capture.output(print(DT)),
c(" x y",
"1: 1 <list[2]>",
"2: 2 <list[2]>"))

########################
# Add new tests here #
Expand Down