-
Notifications
You must be signed in to change notification settings - Fork 1k
Adds optional column count display to print.data.table()
#7791
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.
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
base: master
Are you sure you want to change the base?
Changes from 14 commits
e7e92b1
021d6e2
864954e
1850b39
78621eb
2aec2a5
3e58a32
43dddf2
d638819
aa54da6
d4d80f1
0c69365
6757317
e697d45
61368bf
d21225b
4bc39fc
e908057
beb43fa
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -8,6 +8,7 @@ print.data.table = function(x, topn=getOption("datatable.print.topn"), | |||||
| print.keys=getOption("datatable.print.keys"), | ||||||
| trunc.cols=getOption("datatable.print.trunc.cols"), | ||||||
| show.indices=getOption("datatable.show.indices"), | ||||||
| show.ncols=getOption("datatable.show.ncols", FALSE), | ||||||
| quote=FALSE, | ||||||
| na.print=NULL, | ||||||
| timezone=FALSE, ...) { | ||||||
|
|
@@ -43,6 +44,7 @@ print.data.table = function(x, topn=getOption("datatable.print.topn"), | |||||
| if (!is.numeric(topn)) topn = 5L | ||||||
| topnmiss = missing(topn) | ||||||
| topn = max(as.integer(topn),1L) | ||||||
| show_trunc_message = isTRUE(trunc.cols) | ||||||
| if (print.keys) { | ||||||
| if (!is.null(ky <- key(x))) | ||||||
| catf("Key: <%s>\n", toString(ky)) | ||||||
|
|
@@ -52,6 +54,9 @@ print.data.table = function(x, topn=getOption("datatable.print.topn"), | |||||
| paste0("<", ixs, ">", collapse = ", ") | ||||||
| )) | ||||||
| } | ||||||
| if (show.ncols && !isTRUE(trunc.cols) && !any(dim(x)==0L)) { | ||||||
| trunc_cols_message(character(0), NULL, FALSE, "none", ncol=ncol(x)) | ||||||
| } | ||||||
| if (any(dim(x)==0L)) { | ||||||
| x_class = if (is.data.table(x)) "data.table" else "data.frame" # a data.frame could be passed to print.data.table() directly, #3363 | ||||||
| if (all(dim(x)==0L)) { | ||||||
|
|
@@ -121,8 +126,13 @@ print.data.table = function(x, topn=getOption("datatable.print.topn"), | |||||
| cons_width = getOption("width") | ||||||
| cols_to_print = widths < cons_width | ||||||
| not_printed = colnames(toprint)[!cols_to_print] | ||||||
| if (show.ncols) { | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The column count seems to be wrong when using DT = data.table(a=1:3, b=1:3, c=1:3, d=1:3, e=1:3)
setindex(DT, a)
options(width=20, datatable.show.ncols=TRUE)
print(DT, trunc.cols=TRUE, show.indices=TRUE)
# Index: <a>
# Number of columns: 5, of which 4 are not shown: [c <int>, d <int>, e <int>, index:a <int>]
# a b
# <int> <int>
# 1: 1 1
# 2: 2 2
# 3: 3 3 |
||||||
| trunc_cols_message(not_printed, abbs, class, col.names, ncol=ncol(x)) | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It might be even as simple to exchange |
||||||
| show_trunc_message = FALSE | ||||||
| } | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
wrong indentation |
||||||
|
|
||||||
| if (!any(cols_to_print)) { | ||||||
| trunc_cols_message(not_printed, abbs, class, col.names) | ||||||
| if (show_trunc_message) trunc_cols_message(not_printed, abbs, class, col.names) | ||||||
| return(invisible(x)) | ||||||
| } | ||||||
| # When nrow(toprint) = 1, attributes get lost in the subset, | ||||||
|
|
@@ -134,7 +144,7 @@ print.data.table = function(x, topn=getOption("datatable.print.topn"), | |||||
| if (col.names != "none") cut_colnames = identity | ||||||
| cut_colnames(print(x, right=TRUE, quote=quote, na.print=na.print)) | ||||||
| # prints names of variables not shown in the print | ||||||
| if (trunc.cols) trunc_cols_message(not_printed, abbs, class, col.names) | ||||||
| if (show_trunc_message) trunc_cols_message(not_printed, abbs, class, col.names) | ||||||
| } | ||||||
| if (printdots) { | ||||||
| if (isFALSE(row.names)) { | ||||||
|
|
@@ -291,14 +301,28 @@ toprint_subset = function(x, cols_to_print) { | |||||
| } | ||||||
| } | ||||||
| # message for when trunc.cols=TRUE and some columns are not printed | ||||||
| trunc_cols_message = function(not_printed, abbs, class, col.names){ | ||||||
| trunc_cols_message = function(not_printed, abbs, class, col.names, ncol=NULL){ | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If we have some decent default arg values for |
||||||
| n = length(not_printed) | ||||||
| if (class && col.names != "none") classes = paste0(" ", tail(abbs, n)) else classes = "" | ||||||
| catf( | ||||||
| ngettext(n, "%d variable not shown: %s\n", "%d variables not shown: %s\n"), | ||||||
| n, brackify(paste0(not_printed, classes)), | ||||||
| domain=NA | ||||||
| ) | ||||||
| if (is.null(ncol)) { | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. maybe we make the branching here more clear with if (n == 0L) {
if (!is.null(ncol)) catf("Number of columns: %d\n", ncol)
return()
} |
||||||
| if (n == 0L) return() | ||||||
| if (class && col.names != "none") classes = paste0(" ", tail(abbs, n)) else classes = "" | ||||||
| catf( | ||||||
| ngettext(n, "%d variable not shown: %s\n", "%d variables not shown: %s\n"), | ||||||
| n, brackify(paste0(not_printed, classes)), | ||||||
| domain=NA | ||||||
| ) | ||||||
| } else { | ||||||
| if (n > 0L) { | ||||||
| if (class && col.names != "none") classes = paste0(" ", tail(abbs, n)) else classes = "" | ||||||
| catf( | ||||||
| ngettext(n, "Number of columns: %d, of which %d is not shown: %s\n", "Number of columns: %d, of which %d are not shown: %s\n"), | ||||||
| ncol, n, brackify(paste0(not_printed, classes)), | ||||||
| domain=NA | ||||||
| ) | ||||||
| } else { | ||||||
| catf("Number of columns: %d\n", ncol) | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| # Maybe add a method for repr::repr_text. See https://github.com/Rdatatable/data.table/issues/933#issuecomment-220237965 | ||||||
|
|
||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can we move this below the
any(dim(x)==0L)branch which comes next and drop the!any(dim(x)==0L)guard?