Skip to content

Commit ee11b1e

Browse files
authored
Merge pull request #282 from cmu-delphi/loadallFix
fix: load_all patch, and Roxygen update
2 parents 1aa87bf + 52f6dd1 commit ee11b1e

7 files changed

+13
-18
lines changed

.Rprofile

Lines changed: 0 additions & 11 deletions
This file was deleted.

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,4 @@ Config/testthat/edition: 3
7171
Encoding: UTF-8
7272
LazyData: true
7373
Roxygen: list(markdown = TRUE)
74-
RoxygenNote: 7.2.3
74+
RoxygenNote: 7.3.0

NAMESPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,9 @@ importFrom(quantreg,rq)
203203
importFrom(recipes,bake)
204204
importFrom(recipes,prep)
205205
importFrom(rlang,"!!")
206+
importFrom(rlang,"%@%")
207+
importFrom(rlang,"%||%")
206208
importFrom(rlang,":=")
207-
importFrom(rlang,`%@%`)
208-
importFrom(rlang,`%||%`)
209209
importFrom(rlang,abort)
210210
importFrom(rlang,caller_env)
211211
importFrom(rlang,is_empty)

R/create-layer.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#'
77
#' @inheritParams usethis::use_test
88
#'
9-
#' @importFrom rlang `%||%`
9+
#' @importFrom rlang %||%
1010
#' @export
1111
#'
1212
#' @examples

R/get_test_data.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#' step_epi_lag(death_rate, lag = c(0, 7, 14)) %>%
4141
#' step_epi_lag(case_rate, lag = c(0, 7, 14))
4242
#' get_test_data(recipe = rec, x = case_death_rate_subset)
43-
#' @importFrom rlang `%@%`
43+
#' @importFrom rlang %@%
4444
#' @export
4545

4646
get_test_data <- function(

R/make_quantile_reg.R

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ quantile_reg <- function(mode = "regression", engine = "rq", quantile_levels = 0
4949
}
5050

5151
make_quantile_reg <- function() {
52-
parsnip::set_new_model("quantile_reg")
52+
model_env <- get_model_env()
53+
if (!("quantile_reg" %in% model_env$models)) {
54+
parsnip::set_new_model("quantile_reg")
55+
}
5356
parsnip::set_model_mode("quantile_reg", "regression")
5457

5558

R/make_smooth_quantile_reg.R

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,10 @@ smooth_quantile_reg <- function(
111111

112112

113113
make_smooth_quantile_reg <- function() {
114-
parsnip::set_new_model("smooth_quantile_reg")
114+
model_env <- get_model_env()
115+
if (!("smooth_quantile_reg" %in% model_env$models)) {
116+
parsnip::set_new_model("smooth_quantile_reg")
117+
}
115118
parsnip::set_model_mode("smooth_quantile_reg", "regression")
116119
parsnip::set_model_engine("smooth_quantile_reg", "regression", eng = "smoothqr")
117120
parsnip::set_dependency(

0 commit comments

Comments
 (0)