bugfix: missing values caused error in thresholding

Swarchal · Mar 22, 2023 · 37bbfbb · 37bbfbb
1 parent 2934bd8
commit 37bbfbb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: platetools
 Title: Tools and Plots for Multi-Well Plates
-Version: 0.1.5
+Version: 0.1.6
 Authors@R: person("Scott", "Warchal", email = "scott.warchal@gmail.com", role = c("aut", "cre"))
 Description: Collection of functions for working with multi-well microtitre
     plates, mainly 96, 384 and 1536 well plates.

diff --git a/R/bhit_map.R b/R/bhit_map.R
@@ -101,7 +101,9 @@ bhit_map <- function(data, well, plate = 96, threshold = 2,
 
     # calculate whether values are beyond the threshold; defined as hit or null
     for (row in 1:nrow(platemap)) {
-        if (platemap[row, 'values'] > threshold) {
+        if (!is.finite(platemap[row, "values"])) {
+            platemap$hit[row] <- NaN
+        } else if (platemap[row, 'values'] > threshold) {
             platemap$hit[row] <- "hit"
         } else if (platemap[row, 'values'] < (-1*threshold)) {
             platemap$hit[row] <- "neg_hit"

diff --git a/R/hit_map.R b/R/hit_map.R
@@ -42,7 +42,9 @@ hit_map <- function(data, well, plate = 96, threshold = 2,
 
     # calculate whether values are beyond the threshold; defined as hit or null
     for (row in 1:nrow(platemap)){
-        if (platemap[row, 'values'] > threshold) {
+        if (!is.finite(platemap[row, "values"])) {
+            platemap$hit[row] <-- NaN
+        } else if (platemap[row, 'values'] > threshold) {
             platemap$hit[row] <- "hit"
         } else  if (platemap[row, 'values'] < (-1 * threshold)) {
             platemap$hit[row] <- "neg_hit"