Skip to content

Commit

Permalink
[R-package] Rename slice() to lgb.slice.Dataset() (#6293)
Browse files Browse the repository at this point in the history
  • Loading branch information
david-cortes committed Feb 3, 2024
1 parent 5a1fe74 commit 7435cd8
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 22 deletions.
2 changes: 1 addition & 1 deletion R-package/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@ Imports:
utils
SystemRequirements:
~~CXXSTD~~
RoxygenNote: 7.2.3
RoxygenNote: 7.3.1
3 changes: 1 addition & 2 deletions R-package/NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ S3method(get_field,lgb.Dataset)
S3method(predict,lgb.Booster)
S3method(print,lgb.Booster)
S3method(set_field,lgb.Dataset)
S3method(slice,lgb.Dataset)
S3method(summary,lgb.Booster)
export(getLGBMthreads)
export(get_field)
Expand All @@ -32,11 +31,11 @@ export(lgb.plot.importance)
export(lgb.plot.interpretation)
export(lgb.restore_handle)
export(lgb.save)
export(lgb.slice.Dataset)
export(lgb.train)
export(lightgbm)
export(setLGBMthreads)
export(set_field)
export(slice)
import(methods)
importClassesFrom(Matrix,CsparseMatrix)
importClassesFrom(Matrix,RsparseMatrix)
Expand Down
12 changes: 3 additions & 9 deletions R-package/R/lgb.Dataset.R
Original file line number Diff line number Diff line change
Expand Up @@ -1061,21 +1061,15 @@ dimnames.lgb.Dataset <- function(x) {
#' train <- agaricus.train
#' dtrain <- lgb.Dataset(train$data, label = train$label)
#'
#' dsub <- lightgbm::slice(dtrain, seq_len(42L))
#' dsub <- lgb.slice.Dataset(dtrain, seq_len(42L))
#' lgb.Dataset.construct(dsub)
#' labels <- lightgbm::get_field(dsub, "label")
#' }
#' @export
slice <- function(dataset, idxset) {
UseMethod("slice")
}

#' @rdname slice
#' @export
slice.lgb.Dataset <- function(dataset, idxset) {
lgb.slice.Dataset <- function(dataset, idxset) {

if (!.is_Dataset(x = dataset)) {
stop("slice.lgb.Dataset: input dataset should be an lgb.Dataset object")
stop("lgb.slice.Dataset: input dataset should be an lgb.Dataset object")
}

return(invisible(dataset$slice(idxset = idxset)))
Expand Down
4 changes: 2 additions & 2 deletions R-package/R/lgb.cv.R
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ lgb.cv <- function(params = list()
, init_score = get_field(dataset = data, field_name = "init_score")[test_indices]
)
data.table::setorderv(x = indexDT, cols = "indices", order = 1L)
dtest <- slice(data, indexDT$indices)
dtest <- lgb.slice.Dataset(data, indexDT$indices)
set_field(dataset = dtest, field_name = "weight", data = indexDT$weight)
set_field(dataset = dtest, field_name = "init_score", data = indexDT$init_score)

Expand All @@ -338,7 +338,7 @@ lgb.cv <- function(params = list()
, init_score = get_field(dataset = data, field_name = "init_score")[train_indices]
)
data.table::setorderv(x = indexDT, cols = "indices", order = 1L)
dtrain <- slice(data, indexDT$indices)
dtrain <- lgb.slice.Dataset(data, indexDT$indices)
set_field(dataset = dtrain, field_name = "weight", data = indexDT$weight)
set_field(dataset = dtrain, field_name = "init_score", data = indexDT$init_score)

Expand Down
11 changes: 4 additions & 7 deletions R-package/man/slice.Rd → R-package/man/lgb.slice.Dataset.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion R-package/tests/testthat/test_dataset.R
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ test_that("lgb.Dataset: slice, dim", {
dtest <- lgb.Dataset(test_data, label = test_label)
lgb.Dataset.construct(dtest)
expect_equal(dim(dtest), dim(test_data))
dsub1 <- slice(dtest, seq_len(42L))
dsub1 <- lgb.slice.Dataset(dtest, seq_len(42L))
lgb.Dataset.construct(dsub1)
expect_equal(nrow(dsub1), 42L)
expect_equal(ncol(dsub1), ncol(test_data))
Expand Down

0 comments on commit 7435cd8

Please sign in to comment.