Merge pull request #441 from tidymodels/linting

tidymodels · Aug 8, 2023 · e5c36f2 · e5c36f2
2 parents 98497da + ea49dee
commit e5c36f2
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 5 deletions.
diff --git a/R/class-mcc.R b/R/class-mcc.R
@@ -143,7 +143,7 @@ mcc_binary <- function(data) {
   d3 <- tn + fp
   d4 <- tn + fn
 
-  if (d1 == 0 | d2 == 0 | d3 == 0 | d4 == 0) {
+  if (d1 == 0 || d2 == 0 || d3 == 0 || d4 == 0) {
     return(NA)
   }
 

diff --git a/R/class-npv.R b/R/class-npv.R
@@ -135,7 +135,6 @@ npv_table_impl <- function(data,
 
 npv_binary <- function(data, event_level, prevalence = NULL) {
   positive <- pos_val(data, event_level)
-  negative <- neg_val(data, event_level)
 
   if (is.null(prevalence)) {
     prevalence <- sum(data[, positive]) / sum(data)

diff --git a/R/import-standalone-survival.R b/R/import-standalone-survival.R
@@ -59,7 +59,7 @@
   event_type_to_01 <- !(.extract_surv_type(surv) %in% c("interval", "interval2", "mstate"))
   if (
     event_type_to_01 &&
-      (identical(un_vals, 1:2) | identical(un_vals, c(1.0, 2.0)))) {
+      (identical(un_vals, 1:2) || identical(un_vals, c(1.0, 2.0)))) {
     res <- res - 1
   }
   res

diff --git a/R/prob-brier_class.R b/R/prob-brier_class.R
@@ -126,7 +126,7 @@ brier_ind <- function(truth, estimate, case_weights = NULL) {
     estimate <- matrix(estimate, ncol = 1)
   }
   # In the binary case:
-  if (ncol(estimate) == 1 & ncol(truth) == 2) {
+  if (ncol(estimate) == 1 && ncol(truth) == 2) {
     estimate <- unname(estimate)
     estimate <- vec_cbind(estimate, 1 - estimate, .name_repair = "unique_quiet")
   }

diff --git a/data-raw/dyn-surv-metrics/generate_metrics.R b/data-raw/dyn-surv-metrics/generate_metrics.R
@@ -71,4 +71,3 @@ if (FALSE) {
   brier_churn_res <- as.data.frame(noSplit$Brier$score)
   save(brier_churn_res, file = "brier_churn_res.RData")
 }
-