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

shift on matrix: news and improve error #5462

Merged
merged 3 commits into from
Dec 8, 2023
Merged

shift on matrix: news and improve error #5462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2592ad0
news and improve error
jangorecki Sep 14, 2022
b692f82
Michael feedback, actionable error
jangorecki Dec 8, 2023
cafb272
Merge branch 'master' into no-coerce-matrix
jangorecki Dec 8, 2023
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
4 changes: 4 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

# data.table [v1.14.99](https://github.com/Rdatatable/data.table/milestone/20) (in development)

## BREAKING CHANGE

1. `shift` and `nafill` will now raise error `input must not be matrix or array` when `matrix` or `array` is provided on input, rather than giving useless result, [#5287](https://github.com/Rdatatable/data.table/issues/5287). Thanks to @ethanbsmith for reporting.

## NEW FEATURES

1. `nafill()` now applies `fill=` to the front/back of the vector when `type="locf|nocb"`, [#3594](https://github.com/Rdatatable/data.table/issues/3594). Thanks to @ben519 for the feature request. It also now returns a named object based on the input names. Note that if you are considering joining and then using `nafill(...,type='locf|nocb')` afterwards, please review `roll=`/`rollends=` which should achieve the same result in one step more efficiently. `nafill()` is for when filling-while-joining (i.e. `roll=`/`rollends=`/`nomatch=`) cannot be applied.
Expand Down
3 changes: 3 additions & 0 deletions inst/tests/tests.Rraw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18108,3 +18108,6 @@ test(2238.6, "a" %notin% integer(), TRUE)
test(2238.7, "a" %notin% NULL, TRUE)
test(2238.8, NA %notin% 1:5, TRUE)
test(2238.9, NA %notin% c(1:5, NA), FALSE)

# shift actionable error on matrix input #5287
test(2239.1, shift(matrix(1:10, ncol = 1)), error="consider wrapping")
2 changes: 2 additions & 0 deletions src/shift.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ SEXP shift(SEXP obj, SEXP k, SEXP fill, SEXP type)
if (!xlength(obj)) return(obj); // NULL, list()
SEXP x;
if (isVectorAtomic(obj)) {
if (!isNull(getAttrib(obj, R_DimSymbol)))
error(_("shift input must not be matrix or array, consider wrapping it into data.table() or c()"));
x = PROTECT(allocVector(VECSXP, 1)); nprotect++;
SET_VECTOR_ELT(x, 0, obj);
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ SEXP coerceAs(SEXP x, SEXP as, SEXP copyArg) {
if (!isNull(getAttrib(x, R_DimSymbol)))
error(_("'x' must not be matrix or array"));
if (!isNull(getAttrib(as, R_DimSymbol)))
error(_("'as' must not be matrix or array"));
error(_("input must not be matrix or array"));
jangorecki marked this conversation as resolved.
Show resolved Hide resolved
bool verbose = GetVerbose()>=2; // verbose level 2 required
if (!LOGICAL(copyArg)[0] && TYPEOF(x)==TYPEOF(as) && class1(x)==class1(as)) {
if (verbose)
Expand Down
Loading