assertthatconflict: assertthat::noNA for other scripts

inbo · Nov 12, 2024 · 1032f21 · 1032f21
1 parent 5b1df43
commit 1032f21
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/R/eval.R b/R/eval.R
@@ -669,7 +669,7 @@ eval_chem <- function(data,
 date, lab_sample_id, chem_variable, value, unit, below_loq."
     )
 
-    assert_that(is.flag(uniformity_test), noNA(uniformity_test))
+    assert_that(is.flag(uniformity_test), assertthat::noNA(uniformity_test))
 
     data <-
         data %>%

diff --git a/R/selectlocs.R b/R/selectlocs.R
@@ -360,8 +360,8 @@ selectlocs_xg3 <- function(data,
     }
 
     assert_that(inherits(conditions, "data.frame"))
-    assert_that(is.flag(verbose), noNA(verbose))
-    assert_that(is.flag(list), noNA(list))
+    assert_that(is.flag(verbose), assertthat::noNA(verbose))
+    assert_that(is.flag(list), assertthat::noNA(list))
 
     assert_that(all(c("xg3_variable",
                   "statistic",
@@ -967,8 +967,8 @@ selectlocs_chem <- function(data,
     }
 
     assert_that(inherits(conditions, "data.frame"))
-    assert_that(is.flag(verbose), noNA(verbose))
-    assert_that(is.flag(list), noNA(list))
+    assert_that(is.flag(verbose), assertthat::noNA(verbose))
+    assert_that(is.flag(list), assertthat::noNA(list))
 
     assert_that(all(c("chem_variable",
                       "statistic",
@@ -1167,8 +1167,8 @@ selectlocs <- function(data,
     }
 
     assert_that(inherits(conditions, "data.frame"))
-    assert_that(is.flag(verbose), noNA(verbose))
-    assert_that(is.flag(list), noNA(list))
+    assert_that(is.flag(verbose), assertthat::noNA(verbose))
+    assert_that(is.flag(list), assertthat::noNA(list))
 
     assert_that(all(c("variable",
                       "statistic",

diff --git a/R/sf.R b/R/sf.R
@@ -54,7 +54,7 @@ as_points <- function(df,
     assert_that(is.string(yvar))
     assert_that(has_name(df, xvar))
     assert_that(has_name(df, yvar))
-    assert_that(is.flag(warn_dupl), noNA(warn_dupl))
+    assert_that(is.flag(warn_dupl), assertthat::noNA(warn_dupl))
 
     require_pkgs("sf")