Explicitly return NA_integer_ when comparison includes NAs

fixes #22
ropensci · May 4, 2023 · ff6012d · ff6012d
1 parent e291298
commit ff6012d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/R/utils.R b/R/utils.R
@@ -25,6 +25,11 @@ count_higher <- function(x, y, na_rm = TRUE) {
  # remove any NAs before making comparison
  if (isTRUE(na_rm)) y <- y[!is.na(y)]
 
+ # or return NA_integer_ otherwise if y includes NA
+ if (!isTRUE(na_rm) && any(is.na(y))) {
+ return(NA_integer_)
+ }
+
  # if comparison is zero length, return NA
  if (length(y) == 0) {
  return(NA_integer_)
@@ -60,6 +65,11 @@ count_lower <- function(x, y, na_rm = TRUE) {
  # remove any NAs before making comparison
  if (isTRUE(na_rm)) y <- y[!is.na(y)]
 
+ # or return NA_integer_ otherwise if y includes NA
+ if (!isTRUE(na_rm) && any(is.na(y))) {
+ return(NA_integer_)
+ }
+
  # if comparison is zero length, return NA
  if (length(y) == 0) {
  return(NA_integer_)

diff --git a/tests/testthat/test-utils.R b/tests/testthat/test-utils.R
@@ -6,7 +6,7 @@ test_that("counting higher values works", {
  expect_equal(count_higher(4, c(1:10, NA), na_rm = FALSE), NA_integer_)
  expect_equal(count_higher(4, c(1:10, NaN)), 3)
  expect_equal(count_higher(4, c(1:10, NaN), na_rm = FALSE), NA_integer_)
- expect_equal(count_higher(4, vector("numeric", 0)), NaN)
+ expect_equal(count_higher(4, vector("numeric", 0)), NA_integer_)
 })
 
 test_that("counting lower values works", {
@@ -17,7 +17,7 @@ test_that("counting lower values works", {
  expect_equal(count_lower(4, c(1:10, NA), na_rm = FALSE), NA_integer_)
  expect_equal(count_lower(4, c(1:10, NaN)), 6)
  expect_equal(count_lower(4, c(1:10, NaN), na_rm = FALSE), NA_integer_)
- expect_equal(count_lower(4, vector("numeric", 0)), NaN)
+ expect_equal(count_lower(4, vector("numeric", 0)), NA_integer_)
 })
 
 # see