Merge pull request #282 from cmu-delphi/loadallFix

fix: load_all patch, and Roxygen update
cmu-delphi · Jan 18, 2024 · ee11b1e · ee11b1e
2 parents 1aa87bf + 52f6dd1
commit ee11b1e
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 18 deletions.
diff --git a/.Rprofile b/.Rprofile
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -71,4 +71,4 @@ Config/testthat/edition: 3
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.0
diff --git a/NAMESPACE b/NAMESPACE
@@ -203,9 +203,9 @@ importFrom(quantreg,rq)
 importFrom(recipes,bake)
 importFrom(recipes,prep)
 importFrom(rlang,"!!")
+importFrom(rlang,"%@%")
+importFrom(rlang,"%||%")
 importFrom(rlang,":=")
-importFrom(rlang,`%@%`)
-importFrom(rlang,`%||%`)
 importFrom(rlang,abort)
 importFrom(rlang,caller_env)
 importFrom(rlang,is_empty)

diff --git a/R/create-layer.R b/R/create-layer.R
@@ -6,7 +6,7 @@
 #'
 #' @inheritParams usethis::use_test
 #'
-#' @importFrom rlang `%||%`
+#' @importFrom rlang %||%
 #' @export
 #'
 #' @examples

diff --git a/R/get_test_data.R b/R/get_test_data.R
@@ -40,7 +40,7 @@
 #'   step_epi_lag(death_rate, lag = c(0, 7, 14)) %>%
 #'   step_epi_lag(case_rate, lag = c(0, 7, 14))
 #' get_test_data(recipe = rec, x = case_death_rate_subset)
-#' @importFrom rlang `%@%`
+#' @importFrom rlang %@%
 #' @export
 
 get_test_data <- function(

diff --git a/R/make_quantile_reg.R b/R/make_quantile_reg.R
@@ -49,7 +49,10 @@ quantile_reg <- function(mode = "regression", engine = "rq", quantile_levels = 0
 }
 
 make_quantile_reg <- function() {
-  parsnip::set_new_model("quantile_reg")
+  model_env <- get_model_env()
+  if (!("quantile_reg" %in% model_env$models)) {
+    parsnip::set_new_model("quantile_reg")
+  }
   parsnip::set_model_mode("quantile_reg", "regression")
 
 

diff --git a/R/make_smooth_quantile_reg.R b/R/make_smooth_quantile_reg.R
@@ -111,7 +111,10 @@ smooth_quantile_reg <- function(
 
 
 make_smooth_quantile_reg <- function() {
-  parsnip::set_new_model("smooth_quantile_reg")
+  model_env <- get_model_env()
+  if (!("smooth_quantile_reg" %in% model_env$models)) {
+    parsnip::set_new_model("smooth_quantile_reg")
+  }
   parsnip::set_model_mode("smooth_quantile_reg", "regression")
   parsnip::set_model_engine("smooth_quantile_reg", "regression", eng = "smoothqr")
   parsnip::set_dependency(