Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ Config/testthat/edition: 3
Encoding: UTF-8
LazyData: true
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.3.2
RoxygenNote: 7.3.3
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# parsnip (development version)

* `surv_reg()` is now defunct and will error if called. Please use `survival_reg()` instead (#1206).

# parsnip 1.3.3

* Bug fix in how tunable parameters were configured for brulee neural networks.
Expand Down
55 changes: 32 additions & 23 deletions R/surv_reg.R
Original file line number Diff line number Diff line change
Expand Up @@ -27,32 +27,37 @@
#' @keywords internal
#' @export
surv_reg <- function(mode = "regression", engine = "survival", dist = NULL) {
lifecycle::deprecate_stop("1.4.0", "surv_reg()", "survival_reg()")

lifecycle::deprecate_warn("0.1.6", "surv_reg()", "survival_reg()")

args <- list(
dist = enquo(dist)
)

new_model_spec(
"surv_reg",
args = args,
eng_args = NULL,
mode = mode,
user_specified_mode = !missing(mode),
method = NULL,
engine = engine,
user_specified_engine = !missing(engine)
)
}
args <- list(
dist = enquo(dist)
)

new_model_spec(
"surv_reg",
args = args,
eng_args = NULL,
mode = mode,
user_specified_mode = !missing(mode),
method = NULL,
engine = engine,
user_specified_engine = !missing(engine)
)
}

# nocov
# ------------------------------------------------------------------------------

#' @method update surv_reg
#' @rdname parsnip_update
#' @export
update.surv_reg <- function(object, parameters = NULL, dist = NULL, fresh = FALSE, ...) {

update.surv_reg <- function(
object,
parameters = NULL,
dist = NULL,
fresh = FALSE,
...
) {
args <- list(
dist = enquo(dist)
)
Expand Down Expand Up @@ -84,14 +89,13 @@ translate.surv_reg <- function(x, engine = x$engine, ...) {

#' @export
check_args.surv_reg <- function(object, call = rlang::caller_env()) {

if (object$engine == "flexsurv") {

args <- lapply(object$args, rlang::eval_tidy)

# `dist` has no default in the function
if (all(names(args) != "dist") || is.null(args$dist))
if (all(names(args) != "dist") || is.null(args$dist)) {
object$args$dist <- "weibull"
}
}

invisible(object)
Expand Down Expand Up @@ -132,6 +136,11 @@ flexsurv_mean <- function(results, object) {
flexsurv_quant <- function(results, object) {
results <- map(results, as_tibble)
names(results) <- NULL
results <- map(results, setNames, c(".quantile", ".pred", ".pred_lower", ".pred_upper"))
results <- map(
results,
setNames,
c(".quantile", ".pred", ".pred_lower", ".pred_upper")
)
}

# nocov end
25 changes: 13 additions & 12 deletions R/surv_reg_data.R
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# nocov

set_new_model("surv_reg")
set_model_mode("surv_reg", "regression")
Expand Down Expand Up @@ -50,12 +51,11 @@ set_pred(
pre = NULL,
post = flexsurv_mean,
func = c(fun = "summary"),
args =
list(
object = expr(object$fit),
newdata = expr(new_data),
type = "mean"
)
args = list(
object = expr(object$fit),
newdata = expr(new_data),
type = "mean"
)
)
)

Expand Down Expand Up @@ -106,11 +106,12 @@ set_pred(
pre = NULL,
post = NULL,
func = c(fun = "predict"),
args =
list(
object = expr(object$fit),
newdata = expr(new_data),
type = "response"
)
args = list(
object = expr(object$fit),
newdata = expr(new_data),
type = "response"
)
)
)

# nocov end
2 changes: 1 addition & 1 deletion man/C5_rules.Rd

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

2 changes: 1 addition & 1 deletion man/add_rowindex.Rd

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

2 changes: 1 addition & 1 deletion man/augment.Rd

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

2 changes: 1 addition & 1 deletion man/bart.Rd

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

2 changes: 1 addition & 1 deletion man/boost_tree.Rd

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

2 changes: 1 addition & 1 deletion man/condense_control.Rd

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

2 changes: 1 addition & 1 deletion man/control_parsnip.Rd

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

2 changes: 1 addition & 1 deletion man/ctree_train.Rd

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

2 changes: 1 addition & 1 deletion man/decision_tree.Rd

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

2 changes: 1 addition & 1 deletion man/doc-tools.Rd

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

2 changes: 1 addition & 1 deletion man/dot-get_prediction_column_names.Rd

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

2 changes: 1 addition & 1 deletion man/dot-model_param_name_key.Rd

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

2 changes: 1 addition & 1 deletion man/extract-parsnip.Rd

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

2 changes: 1 addition & 1 deletion man/fit.Rd

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

2 changes: 1 addition & 1 deletion man/fit_control.Rd

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

2 changes: 1 addition & 1 deletion man/gen_additive_mod.Rd

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

2 changes: 1 addition & 1 deletion man/get_model_env.Rd

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

2 changes: 1 addition & 1 deletion man/glm_grouped.Rd

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

2 changes: 1 addition & 1 deletion man/has_multi_predict.Rd

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

2 changes: 1 addition & 1 deletion man/linear_reg.Rd

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

2 changes: 1 addition & 1 deletion man/logistic_reg.Rd

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

2 changes: 1 addition & 1 deletion man/mars.Rd

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

2 changes: 1 addition & 1 deletion man/max_mtry_formula.Rd

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

2 changes: 1 addition & 1 deletion man/min_cols.Rd

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

2 changes: 1 addition & 1 deletion man/mlp.Rd

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

2 changes: 1 addition & 1 deletion man/model_db.Rd

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

2 changes: 1 addition & 1 deletion man/model_fit.Rd

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

2 changes: 1 addition & 1 deletion man/multinom_reg.Rd

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

Loading
Loading