fix checks

NorskRegnesentral · Aug 16, 2024 · 803a181 · 803a181
1 parent 6b4931d
commit 803a181
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/R/compute_estimates.R b/R/compute_estimates.R
@@ -313,7 +313,8 @@ bootstrap_shapley_new <- function(internal, dt_vS, n_boot_samps = 100, seed = 12
       is_groupwise = FALSE
     )
 
-    kshap_boot <- t(W_boot %*% as.matrix(dt_vS[id_combination %in% X_boot[boot_id == i, id_combination], -"id_combination"]))
+    kshap_boot <- t(W_boot %*% as.matrix(dt_vS[id_combination %in% X_boot[boot_id == i,
+                                                                          id_combination], -"id_combination"]))
 
     boot_sd_array[, , i] <- copy(kshap_boot)
   }

diff --git a/R/setup.R b/R/setup.R
@@ -581,17 +581,17 @@ check_max_n_combinations_fc <- function(internal) {
     if (!is_groupwise) {
       if (max_n_combinations <= n_features) {
         stop(paste0(
-          "`max_n_combinations` (", max_n_combinations, ") has to be greater than the number of components to decompose ",
-          " the forecast onto:\n",
+          "`max_n_combinations` (", max_n_combinations, ") has to be greater than the number of ",
+          "components to decompose the forecast onto:\n",
           "`horizon` (", horizon, ") + `explain_y_lags` (", explain_y_lags, ") ",
           "+ sum(`explain_xreg_lags`) (", sum(explain_xreg_lags), ").\n"
         ))
       }
     } else {
       if (max_n_combinations <= n_groups) {
         stop(paste0(
-          "`max_n_combinations` (", max_n_combinations, ") has to be greater than the number of components to decompose ",
-          "the forecast onto:\n",
+          "`max_n_combinations` (", max_n_combinations, ") has to be greater than the number of ",
+          "components to decompose the forecast onto:\n",
           "ncol(`xreg`) (", ncol(`xreg`), ") + 1"
         ))
       }

diff --git a/R/shapley_setup.R b/R/shapley_setup.R
@@ -150,7 +150,7 @@ shapley_setup <- function(internal) {
 #' # Subsample of combinations
 #' x <- feature_combinations(exact = FALSE, m = 10, n_combinations = 1e2)
 feature_combinations <- function(m, exact = TRUE, n_combinations = 200, weight_zero_m = 10^6, group_num = NULL,
-                                 paired_shap_sampling = TRUE, prev_feature_samples = NULL, unique_sampling) {
+                                 paired_shap_sampling = TRUE, prev_feature_samples = NULL, unique_sampling = TRUE) {
   is_groupwise <- length(group_num) > 0
 
   this_m <- ifelse(is_groupwise, length(group_num), m)

diff --git a/R/zzz.R b/R/zzz.R
@@ -116,7 +116,10 @@
       "req_samples",
       "explain_id",
       "id_combination_new",
-      "features_str"
+      "features_str",
+      "boot_id",
+      "iter",
+      "total"
     )
   )
 

diff --git a/tests/testthat/test-regular-setup.R b/tests/testthat/test-regular-setup.R
@@ -393,7 +393,7 @@ test_that("erroneous input: `max_n_combinations`", {
   expect_snapshot(
     {
       # non-numeric 1
-      max_n_combinations_non_numeric_1 <- "bla"
+      max_n_comb_non_numeric_1 <- "bla"
 
       explain(
         testing = TRUE,
@@ -402,7 +402,7 @@ test_that("erroneous input: `max_n_combinations`", {
         x_train = x_train_numeric,
         approach = "independence",
         prediction_zero = p0,
-        max_n_combinations = max_n_combinations_non_numeric_1,
+        max_n_combinations = max_n_comb_non_numeric_1,
         n_batches = 1
       )
     },
@@ -412,7 +412,7 @@ test_that("erroneous input: `max_n_combinations`", {
   expect_snapshot(
     {
       # non-numeric 2
-      max_n_combinations_non_numeric_2 <- TRUE
+      max_n_comb_non_numeric_2 <- TRUE
 
       explain(
         testing = TRUE,
@@ -421,7 +421,7 @@ test_that("erroneous input: `max_n_combinations`", {
         x_train = x_train_numeric,
         approach = "independence",
         prediction_zero = p0,
-        max_n_combinations = max_n_combinations_non_numeric_2,
+        max_n_combinations = max_n_comb_non_numeric_2,
         n_batches = 1
       )
     },
@@ -491,7 +491,7 @@ test_that("erroneous input: `max_n_combinations`", {
   expect_snapshot(
     {
       # Non-positive
-      max_n_combinations_non_positive <- 0
+      max_n_comb_non_positive <- 0
 
       explain(
         testing = TRUE,
@@ -500,7 +500,7 @@ test_that("erroneous input: `max_n_combinations`", {
         x_train = x_train_numeric,
         approach = "independence",
         prediction_zero = p0,
-        max_n_combinations = max_n_combinations_non_positive,
+        max_n_combinations = max_n_comb_non_positive,
         n_batches = 1
       )
     },