Skip to content

Update engine-specific args #351

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

Merged
merged 21 commits into from
Jul 31, 2020
Merged

Update engine-specific args #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
40a2cd8
Change update_dot_check() to take already enquoed dots
juliasilge Jul 29, 2020
215d238
Also update engine-specific random forest args
juliasilge Jul 29, 2020
875171f
Refactor engine parameter updating out into little function
juliasilge Jul 29, 2020
a39667a
Use new function for random forest
juliasilge Jul 29, 2020
9ca7ccb
Tests for updating engine specific random forest params
juliasilge Jul 29, 2020
235b66c
Merge branch 'master' into update-engine-args
juliasilge Jul 29, 2020
93233c4
Handle NULL engine specific args in model specification
juliasilge Jul 29, 2020
5058f38
Update engine specific arguments for boost_tree()
juliasilge Jul 30, 2020
111c996
Update engine specific args for decision_tree()
juliasilge Jul 30, 2020
f5adad6
Updating for linear_reg() engine specific args
juliasilge Jul 30, 2020
2bf7b04
Updating for logistic_reg() engine specific params
juliasilge Jul 30, 2020
4ac31fb
Updating for mars() engine-specific args
juliasilge Jul 30, 2020
c71ad65
Updating for mlp() engine specific args
juliasilge Jul 30, 2020
3a52078
Updating for multinom() engine specific args
juliasilge Jul 30, 2020
ede3d8a
Updating for nearest_neighbor() engine specific args
juliasilge Jul 30, 2020
6c2952a
Updating for surv_reg() engine specific args
juliasilge Jul 30, 2020
ec6b08e
Updating for svm_poly() engine specific args
juliasilge Jul 30, 2020
82e68cf
Updating for svm_rbf() engine specific args
juliasilge Jul 30, 2020
5e58b9d
Comment about when engine args can be updated (only if they are in th…
juliasilge Jul 30, 2020
b762088
Adjust test for nearest_neighbor()
juliasilge Jul 30, 2020
d9075f0
Redocument
juliasilge Jul 30, 2020
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
1 change: 1 addition & 0 deletions NAMESPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ export(tidy)
export(translate)
export(translate.default)
export(update_dot_check)
export(update_engine_parameters)
export(update_main_parameters)
export(varying)
export(varying_args)
Expand Down
6 changes: 5 additions & 1 deletion R/boost_tree.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,8 @@ update.boost_tree <-
loss_reduction = NULL, sample_size = NULL,
stop_iter = NULL,
fresh = FALSE, ...) {
update_dot_check(...)

eng_args <- update_engine_parameters(object$eng_args, ...)

if (!is.null(parameters)) {
parameters <- check_final_param(parameters)
Expand All @@ -185,12 +186,15 @@ update.boost_tree <-
# TODO make these blocks into a function and document well
if (fresh) {
object$args <- args
object$eng_args <- eng_args
} else {
null_args <- map_lgl(args, null_value)
if (any(null_args))
args <- args[!null_args]
if (length(args) > 0)
object$args[names(args)] <- args
if (length(eng_args) > 0)
object$eng_args[names(eng_args)] <- eng_args
}

new_model_spec(
Expand Down
6 changes: 5 additions & 1 deletion R/decision_tree.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ update.decision_tree <-
parameters = NULL,
cost_complexity = NULL, tree_depth = NULL, min_n = NULL,
fresh = FALSE, ...) {
update_dot_check(...)

eng_args <- update_engine_parameters(object$eng_args, ...)

if (!is.null(parameters)) {
parameters <- check_final_param(parameters)
Expand All @@ -131,12 +132,15 @@ update.decision_tree <-

if (fresh) {
object$args <- args
object$eng_args <- eng_args
} else {
null_args <- map_lgl(args, null_value)
if (any(null_args))
args <- args[!null_args]
if (length(args) > 0)
object$args[names(args)] <- args
if (length(eng_args) > 0)
object$eng_args[names(eng_args)] <- eng_args
}

new_model_spec(
Expand Down
6 changes: 5 additions & 1 deletion R/linear_reg.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,8 @@ update.linear_reg <-
parameters = NULL,
penalty = NULL, mixture = NULL,
fresh = FALSE, ...) {
update_dot_check(...)

eng_args <- update_engine_parameters(object$eng_args, ...)

if (!is.null(parameters)) {
parameters <- check_final_param(parameters)
Expand All @@ -145,12 +146,15 @@ update.linear_reg <-

if (fresh) {
object$args <- args
object$eng_args <- eng_args
} else {
null_args <- map_lgl(args, null_value)
if (any(null_args))
args <- args[!null_args]
if (length(args) > 0)
object$args[names(args)] <- args
if (length(eng_args) > 0)
object$eng_args[names(eng_args)] <- eng_args
}

new_model_spec(
Expand Down
6 changes: 5 additions & 1 deletion R/logistic_reg.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ update.logistic_reg <-
parameters = NULL,
penalty = NULL, mixture = NULL,
fresh = FALSE, ...) {
update_dot_check(...)

eng_args <- update_engine_parameters(object$eng_args, ...)

if (!is.null(parameters)) {
parameters <- check_final_param(parameters)
Expand All @@ -129,12 +130,15 @@ update.logistic_reg <-

if (fresh) {
object$args <- args
object$eng_args <- eng_args
} else {
null_args <- map_lgl(args, null_value)
if (any(null_args))
args <- args[!null_args]
if (length(args) > 0)
object$args[names(args)] <- args
if (length(eng_args) > 0)
object$eng_args[names(eng_args)] <- eng_args
}

new_model_spec(
Expand Down
6 changes: 5 additions & 1 deletion R/mars.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ update.mars <-
parameters = NULL,
num_terms = NULL, prod_degree = NULL, prune_method = NULL,
fresh = FALSE, ...) {
update_dot_check(...)

eng_args <- update_engine_parameters(object$eng_args, ...)

if (!is.null(parameters)) {
parameters <- check_final_param(parameters)
Expand All @@ -109,12 +110,15 @@ update.mars <-

if (fresh) {
object$args <- args
object$eng_args <- eng_args
} else {
null_args <- map_lgl(args, null_value)
if (any(null_args))
args <- args[!null_args]
if (length(args) > 0)
object$args[names(args)] <- args
if (length(eng_args) > 0)
object$eng_args[names(eng_args)] <- eng_args
}

new_model_spec(
Expand Down
23 changes: 21 additions & 2 deletions R/misc.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,7 @@ names0 <- function (num, prefix = "x") {
#' @export
#' @keywords internal
#' @rdname add_on_exports
update_dot_check <- function(...) {
dots <- enquos(...)
update_dot_check <- function(dots) {
if (length(dots) > 0)
rlang::abort(
glue::glue(
Expand Down Expand Up @@ -282,5 +281,25 @@ update_main_parameters <- function(args, param) {
args <- utils::modifyList(args, param)
}

#' @export
#' @keywords internal
#' @rdname add_on_exports
update_engine_parameters <- function(eng_args, ...) {

dots <- enquos(...)

## only update from dots when there are eng args in original model spec
if (is_null(eng_args)) {
ret <- NULL
} else {
ret <- utils::modifyList(eng_args, dots)
}

has_extra_dots <- !(names(dots) %in% names(eng_args))
dots <- dots[has_extra_dots]
update_dot_check(dots)

ret
}


6 changes: 5 additions & 1 deletion R/mlp.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ update.mlp <-
hidden_units = NULL, penalty = NULL, dropout = NULL,
epochs = NULL, activation = NULL,
fresh = FALSE, ...) {
update_dot_check(...)

eng_args <- update_engine_parameters(object$eng_args, ...)

if (!is.null(parameters)) {
parameters <- check_final_param(parameters)
Expand All @@ -139,12 +140,15 @@ update.mlp <-
# TODO make these blocks into a function and document well
if (fresh) {
object$args <- args
object$eng_args <- eng_args
} else {
null_args <- map_lgl(args, null_value)
if (any(null_args))
args <- args[!null_args]
if (length(args) > 0)
object$args[names(args)] <- args
if (length(eng_args) > 0)
object$eng_args[names(eng_args)] <- eng_args
}

new_model_spec(
Expand Down
6 changes: 5 additions & 1 deletion R/multinom_reg.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ update.multinom_reg <-
parameters = NULL,
penalty = NULL, mixture = NULL,
fresh = FALSE, ...) {
update_dot_check(...)

eng_args <- update_engine_parameters(object$eng_args, ...)

if (!is.null(parameters)) {
parameters <- check_final_param(parameters)
Expand All @@ -128,12 +129,15 @@ update.multinom_reg <-

if (fresh) {
object$args <- args
object$eng_args <- eng_args
} else {
null_args <- map_lgl(args, null_value)
if (any(null_args))
args <- args[!null_args]
if (length(args) > 0)
object$args[names(args)] <- args
if (length(eng_args) > 0)
object$eng_args[names(eng_args)] <- eng_args
}

new_model_spec(
Expand Down
6 changes: 5 additions & 1 deletion R/nearest_neighbor.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ update.nearest_neighbor <- function(object,
weight_func = NULL,
dist_power = NULL,
fresh = FALSE, ...) {
update_dot_check(...)

eng_args <- update_engine_parameters(object$eng_args, ...)

if (!is.null(parameters)) {
parameters <- check_final_param(parameters)
Expand All @@ -112,12 +113,15 @@ update.nearest_neighbor <- function(object,

if (fresh) {
object$args <- args
object$eng_args <- eng_args
} else {
null_args <- map_lgl(args, null_value)
if (any(null_args))
args <- args[!null_args]
if (length(args) > 0)
object$args[names(args)] <- args
if (length(eng_args) > 0)
object$eng_args[names(eng_args)] <- eng_args
}

new_model_spec(
Expand Down
6 changes: 5 additions & 1 deletion R/rand_forest.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ update.rand_forest <-
parameters = NULL,
mtry = NULL, trees = NULL, min_n = NULL,
fresh = FALSE, ...) {
update_dot_check(...)

eng_args <- update_engine_parameters(object$eng_args, ...)

if (!is.null(parameters)) {
parameters <- check_final_param(parameters)
Expand All @@ -126,12 +127,15 @@ update.rand_forest <-
# TODO make these blocks into a function and document well
if (fresh) {
object$args <- args
object$eng_args <- eng_args
} else {
null_args <- map_lgl(args, null_value)
if (any(null_args))
args <- args[!null_args]
if (length(args) > 0)
object$args[names(args)] <- args
if (length(eng_args) > 0)
object$eng_args[names(eng_args)] <- eng_args
}

new_model_spec(
Expand Down
6 changes: 5 additions & 1 deletion R/surv_reg.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ print.surv_reg <- function(x, ...) {
#' @rdname surv_reg
#' @export
update.surv_reg <- function(object, parameters = NULL, dist = NULL, fresh = FALSE, ...) {
update_dot_check(...)

eng_args <- update_engine_parameters(object$eng_args, ...)

if (!is.null(parameters)) {
parameters <- check_final_param(parameters)
Expand All @@ -110,12 +111,15 @@ update.surv_reg <- function(object, parameters = NULL, dist = NULL, fresh = FALS

if (fresh) {
object$args <- args
object$eng_args <- eng_args
} else {
null_args <- map_lgl(args, null_value)
if (any(null_args))
args <- args[!null_args]
if (length(args) > 0)
object$args[names(args)] <- args
if (length(eng_args) > 0)
object$eng_args[names(eng_args)] <- eng_args
}

new_model_spec(
Expand Down
6 changes: 5 additions & 1 deletion R/svm_poly.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ update.svm_poly <-
cost = NULL, degree = NULL, scale_factor = NULL, margin = NULL,
fresh = FALSE,
...) {
update_dot_check(...)

eng_args <- update_engine_parameters(object$eng_args, ...)

if (!is.null(parameters)) {
parameters <- check_final_param(parameters)
Expand All @@ -115,12 +116,15 @@ update.svm_poly <-

if (fresh) {
object$args <- args
object$eng_args <- eng_args
} else {
null_args <- map_lgl(args, null_value)
if (any(null_args))
args <- args[!null_args]
if (length(args) > 0)
object$args[names(args)] <- args
if (length(eng_args) > 0)
object$eng_args[names(eng_args)] <- eng_args
}

new_model_spec(
Expand Down
6 changes: 5 additions & 1 deletion R/svm_rbf.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ update.svm_rbf <-
cost = NULL, rbf_sigma = NULL, margin = NULL,
fresh = FALSE,
...) {
update_dot_check(...)

eng_args <- update_engine_parameters(object$eng_args, ...)

if (!is.null(parameters)) {
parameters <- check_final_param(parameters)
Expand All @@ -114,12 +115,15 @@ update.svm_rbf <-

if (fresh) {
object$args <- args
object$eng_args <- eng_args
} else {
null_args <- map_lgl(args, null_value)
if (any(null_args))
args <- args[!null_args]
if (length(args) > 0)
object$args[names(args)] <- args
if (length(eng_args) > 0)
object$eng_args[names(eng_args)] <- eng_args
}

new_model_spec(
Expand Down
5 changes: 4 additions & 1 deletion man/add_on_exports.Rd
View file
Open in desktop

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

Loading