align r/test files for workflow happiness

tidymodels · Apr 22, 2024 · 17e154a · 17e154a
1 parent 6e811da
commit 17e154a
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 44 deletions.
diff --git a/R/equivocal_zone.R → R/equivocal-zone.R b/R/equivocal_zone.R → R/equivocal-zone.R
diff --git a/R/numeric_calibration.R → R/numeric-calibration.R b/R/numeric_calibration.R → R/numeric-calibration.R
diff --git a/R/numeric_range.R → R/numeric-range.R b/R/numeric_range.R → R/numeric-range.R
diff --git a/R/predictions_custom.R → R/predictions-custom.R b/R/predictions_custom.R → R/predictions-custom.R
diff --git a/R/prob_threshold.R → R/prob-threshold.R b/R/prob_threshold.R → R/prob-threshold.R
diff --git a/R/probability_calibration.R → R/probability-calibration.R b/R/probability_calibration.R → R/probability-calibration.R
diff --git a/R/misc.R → R/utils.R b/R/misc.R → R/utils.R
diff --git a/tests/testthat/_snaps/validation-regression.md b/tests/testthat/_snaps/validation-regression.md
diff --git a/...tthat/_snaps/validation-classification.md → tests/testthat/_snaps/validation-rules.md b/...tthat/_snaps/validation-classification.md → tests/testthat/_snaps/validation-rules.md
@@ -1,4 +1,14 @@
-# validation of classification operations
+# validation of operations (regression)
+
+    Code
+      container(mode = "regression") %>% adjust_numeric_range(lower_limit = 2) %>%
+        adjust_numeric_calibration(dummy_reg_cal) %>% adjust_predictions_custom(
+        squared = .pred^2)
+    Condition
+      Error in `adjust_numeric_calibration()`:
+      ! Calibration should come before other operations.
+
+# validation of operations (classification)
 
     Code
       container(mode = "classification") %>% adjust_probability_threshold(threshold = 0.4) %>%

diff --git a/tests/testthat/test-validation-regression.R b/tests/testthat/test-validation-regression.R
diff --git a/...testthat/test-validation-classification.R → tests/testthat/test-validation-rules.R b/...testthat/test-validation-classification.R → tests/testthat/test-validation-rules.R
@@ -1,5 +1,35 @@
-test_that("validation of classification operations", {
+test_that("validation of operations (regression)", {
+  dummy_reg_cal <- list()
+  class(dummy_reg_cal) <- "cal_regression"
 
+  expect_silent(
+    reg_ctr <-
+      container(mode = "regression") %>%
+      adjust_numeric_calibration(dummy_reg_cal) %>%
+      adjust_numeric_range(lower_limit = 2) %>%
+      adjust_predictions_custom(squared = .pred^2)
+  )
+
+  expect_snapshot(
+    container(mode = "regression") %>%
+      adjust_numeric_range(lower_limit = 2) %>%
+      adjust_numeric_calibration(dummy_reg_cal) %>%
+      adjust_predictions_custom(squared = .pred^2),
+    error = TRUE
+  )
+
+  # todo should we error if a mutate occurs beforehand? Can we detect if it
+  # modifies the prediction?
+  expect_silent(
+    reg_ctr <-
+      container(mode = "regression") %>%
+      adjust_predictions_custom(squared = .pred^2) %>%
+      adjust_numeric_calibration(dummy_reg_cal) %>%
+      adjust_numeric_range(lower_limit = 2)
+  )
+})
+
+test_that("validation of operations (classification)", {
   dummy_cls_cal <- list()
   class(dummy_cls_cal) <- "cal_binary"