[R] remove more uses of default values in internal functions (#9476)
This commit is contained in:
parent
2c84daeca7
commit
e3f624d8e7
@ -88,7 +88,7 @@ xgb.DMatrix <- function(data, info = list(), missing = NA, silent = FALSE, nthre
|
||||
|
||||
# get dmatrix from data, label
|
||||
# internal helper method
|
||||
xgb.get.DMatrix <- function(data, label = NULL, missing = NA, weight = NULL, nthread = NULL) {
|
||||
xgb.get.DMatrix <- function(data, label, missing, weight, nthread) {
|
||||
if (inherits(data, "dgCMatrix") || is.matrix(data)) {
|
||||
if (is.null(label)) {
|
||||
stop("label must be provided when data is a matrix")
|
||||
|
||||
@ -194,7 +194,13 @@ xgb.cv <- function(params = list(), data, nrounds, nfold, label = NULL, missing
|
||||
|
||||
# create the booster-folds
|
||||
# train_folds
|
||||
dall <- xgb.get.DMatrix(data, label, missing, nthread = params$nthread)
|
||||
dall <- xgb.get.DMatrix(
|
||||
data = data,
|
||||
label = label,
|
||||
missing = missing,
|
||||
weight = NULL,
|
||||
nthread = params$nthread
|
||||
)
|
||||
bst_folds <- lapply(seq_along(folds), function(k) {
|
||||
dtest <- slice(dall, folds[[k]])
|
||||
# code originally contributed by @RolandASc on stackoverflow
|
||||
|
||||
@ -183,7 +183,7 @@ normalize <- function(x) {
|
||||
# ... the plots
|
||||
# cols number of columns
|
||||
# internal utility function
|
||||
multiplot <- function(..., cols = 1) {
|
||||
multiplot <- function(..., cols) {
|
||||
plots <- list(...)
|
||||
num_plots <- length(plots)
|
||||
|
||||
|
||||
@ -10,7 +10,13 @@ xgboost <- function(data = NULL, label = NULL, missing = NA, weight = NULL,
|
||||
save_period = NULL, save_name = "xgboost.model",
|
||||
xgb_model = NULL, callbacks = list(), ...) {
|
||||
merged <- check.booster.params(params, ...)
|
||||
dtrain <- xgb.get.DMatrix(data, label, missing, weight, nthread = merged$nthread)
|
||||
dtrain <- xgb.get.DMatrix(
|
||||
data = data,
|
||||
label = label,
|
||||
missing = missing,
|
||||
weight = weight,
|
||||
nthread = merged$nthread
|
||||
)
|
||||
|
||||
watchlist <- list(train = dtrain)
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user