Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
tianlh
LightGBM-DCU
Commits
7435cd8d
Unverified
Commit
7435cd8d
authored
Feb 03, 2024
by
david-cortes
Committed by
GitHub
Feb 03, 2024
Browse files
[R-package] Rename `slice()` to `lgb.slice.Dataset()` (#6293)
parent
5a1fe74e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
22 deletions
+12
-22
R-package/DESCRIPTION
R-package/DESCRIPTION
+1
-1
R-package/NAMESPACE
R-package/NAMESPACE
+1
-2
R-package/R/lgb.Dataset.R
R-package/R/lgb.Dataset.R
+3
-9
R-package/R/lgb.cv.R
R-package/R/lgb.cv.R
+2
-2
R-package/man/lgb.slice.Dataset.Rd
R-package/man/lgb.slice.Dataset.Rd
+4
-7
R-package/tests/testthat/test_dataset.R
R-package/tests/testthat/test_dataset.R
+1
-1
No files found.
R-package/DESCRIPTION
View file @
7435cd8d
...
@@ -63,4 +63,4 @@ Imports:
...
@@ -63,4 +63,4 @@ Imports:
utils
utils
SystemRequirements:
SystemRequirements:
~~CXXSTD~~
~~CXXSTD~~
RoxygenNote: 7.
2.3
RoxygenNote: 7.
3.1
R-package/NAMESPACE
View file @
7435cd8d
...
@@ -7,7 +7,6 @@ S3method(get_field,lgb.Dataset)
...
@@ -7,7 +7,6 @@ S3method(get_field,lgb.Dataset)
S3method(predict,lgb.Booster)
S3method(predict,lgb.Booster)
S3method(print,lgb.Booster)
S3method(print,lgb.Booster)
S3method(set_field,lgb.Dataset)
S3method(set_field,lgb.Dataset)
S3method(slice,lgb.Dataset)
S3method(summary,lgb.Booster)
S3method(summary,lgb.Booster)
export(getLGBMthreads)
export(getLGBMthreads)
export(get_field)
export(get_field)
...
@@ -32,11 +31,11 @@ export(lgb.plot.importance)
...
@@ -32,11 +31,11 @@ export(lgb.plot.importance)
export(lgb.plot.interpretation)
export(lgb.plot.interpretation)
export(lgb.restore_handle)
export(lgb.restore_handle)
export(lgb.save)
export(lgb.save)
export(lgb.slice.Dataset)
export(lgb.train)
export(lgb.train)
export(lightgbm)
export(lightgbm)
export(setLGBMthreads)
export(setLGBMthreads)
export(set_field)
export(set_field)
export(slice)
import(methods)
import(methods)
importClassesFrom(Matrix,CsparseMatrix)
importClassesFrom(Matrix,CsparseMatrix)
importClassesFrom(Matrix,RsparseMatrix)
importClassesFrom(Matrix,RsparseMatrix)
...
...
R-package/R/lgb.Dataset.R
View file @
7435cd8d
...
@@ -1061,21 +1061,15 @@ dimnames.lgb.Dataset <- function(x) {
...
@@ -1061,21 +1061,15 @@ dimnames.lgb.Dataset <- function(x) {
#' train <- agaricus.train
#' train <- agaricus.train
#' dtrain <- lgb.Dataset(train$data, label = train$label)
#' dtrain <- lgb.Dataset(train$data, label = train$label)
#'
#'
#' dsub <- l
ightgbm::slice
(dtrain, seq_len(42L))
#' dsub <- l
gb.slice.Dataset
(dtrain, seq_len(42L))
#' lgb.Dataset.construct(dsub)
#' lgb.Dataset.construct(dsub)
#' labels <- lightgbm::get_field(dsub, "label")
#' labels <- lightgbm::get_field(dsub, "label")
#' }
#' }
#' @export
#' @export
slice
<-
function
(
dataset
,
idxset
)
{
lgb.slice.Dataset
<-
function
(
dataset
,
idxset
)
{
UseMethod
(
"slice"
)
}
#' @rdname slice
#' @export
slice.lgb.Dataset
<-
function
(
dataset
,
idxset
)
{
if
(
!
.is_Dataset
(
x
=
dataset
))
{
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
)))
return
(
invisible
(
dataset
$
slice
(
idxset
=
idxset
)))
...
...
R-package/R/lgb.cv.R
View file @
7435cd8d
...
@@ -327,7 +327,7 @@ lgb.cv <- function(params = list()
...
@@ -327,7 +327,7 @@ lgb.cv <- function(params = list()
,
init_score
=
get_field
(
dataset
=
data
,
field_name
=
"init_score"
)[
test_indices
]
,
init_score
=
get_field
(
dataset
=
data
,
field_name
=
"init_score"
)[
test_indices
]
)
)
data.table
::
setorderv
(
x
=
indexDT
,
cols
=
"indices"
,
order
=
1L
)
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
=
"weight"
,
data
=
indexDT
$
weight
)
set_field
(
dataset
=
dtest
,
field_name
=
"init_score"
,
data
=
indexDT
$
init_score
)
set_field
(
dataset
=
dtest
,
field_name
=
"init_score"
,
data
=
indexDT
$
init_score
)
...
@@ -338,7 +338,7 @@ lgb.cv <- function(params = list()
...
@@ -338,7 +338,7 @@ lgb.cv <- function(params = list()
,
init_score
=
get_field
(
dataset
=
data
,
field_name
=
"init_score"
)[
train_indices
]
,
init_score
=
get_field
(
dataset
=
data
,
field_name
=
"init_score"
)[
train_indices
]
)
)
data.table
::
setorderv
(
x
=
indexDT
,
cols
=
"indices"
,
order
=
1L
)
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
=
"weight"
,
data
=
indexDT
$
weight
)
set_field
(
dataset
=
dtrain
,
field_name
=
"init_score"
,
data
=
indexDT
$
init_score
)
set_field
(
dataset
=
dtrain
,
field_name
=
"init_score"
,
data
=
indexDT
$
init_score
)
...
...
R-package/man/slice.Rd
→
R-package/man/
lgb.
slice.
Dataset.
Rd
View file @
7435cd8d
% Generated by roxygen2: do not edit by hand
% Generated by roxygen2: do not edit by hand
% Please edit documentation in R/lgb.Dataset.R
% Please edit documentation in R/lgb.Dataset.R
\name{slice}
\name{lgb.slice.Dataset}
\alias{slice}
\alias{lgb.slice.Dataset}
\alias{slice.lgb.Dataset}
\title{Slice a dataset}
\title{Slice a dataset}
\usage{
\usage{
slice(dataset, idxset)
lgb.slice.Dataset(dataset, idxset)
\method{slice}{lgb.Dataset}(dataset, idxset)
}
}
\arguments{
\arguments{
\item{dataset}{Object of class \code{lgb.Dataset}}
\item{dataset}{Object of class \code{lgb.Dataset}}
...
@@ -29,7 +26,7 @@ data(agaricus.train, package = "lightgbm")
...
@@ -29,7 +26,7 @@ data(agaricus.train, package = "lightgbm")
train <- agaricus.train
train <- agaricus.train
dtrain <- lgb.Dataset(train$data, label = train$label)
dtrain <- lgb.Dataset(train$data, label = train$label)
dsub <- l
ightgbm::slice
(dtrain, seq_len(42L))
dsub <- l
gb.slice.Dataset
(dtrain, seq_len(42L))
lgb.Dataset.construct(dsub)
lgb.Dataset.construct(dsub)
labels <- lightgbm::get_field(dsub, "label")
labels <- lightgbm::get_field(dsub, "label")
}
}
...
...
R-package/tests/testthat/test_dataset.R
View file @
7435cd8d
...
@@ -53,7 +53,7 @@ test_that("lgb.Dataset: slice, dim", {
...
@@ -53,7 +53,7 @@ test_that("lgb.Dataset: slice, dim", {
dtest
<-
lgb.Dataset
(
test_data
,
label
=
test_label
)
dtest
<-
lgb.Dataset
(
test_data
,
label
=
test_label
)
lgb.Dataset.construct
(
dtest
)
lgb.Dataset.construct
(
dtest
)
expect_equal
(
dim
(
dtest
),
dim
(
test_data
))
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
)
lgb.Dataset.construct
(
dsub1
)
expect_equal
(
nrow
(
dsub1
),
42L
)
expect_equal
(
nrow
(
dsub1
),
42L
)
expect_equal
(
ncol
(
dsub1
),
ncol
(
test_data
))
expect_equal
(
ncol
(
dsub1
),
ncol
(
test_data
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment