fixes range calculation in the presence of NA (see #32)

ParkerICI · Apr 14, 2020 · 467d641 · 467d641
1 parent e0324f6
commit 467d641
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: premessa
 Type: Package
 Title: R package for pre-processing of flow and mass cytometry data
-Version: 0.2.5
+Version: 0.2.6
 Author: "Pier Federico Gherardini <pfgherardini@parkerici.org> [aut, cre]"
 Description: This package includes panel editing/renaming for FCS files, bead-based normalization and debarcoding.
 Imports: shiny (>= 0.14), flowCore, reshape, ggplot2, hexbin, gridExtra, rhandsontable, jsonlite

diff --git a/R/fcs_io.R b/R/fcs_io.R
@@ -27,7 +27,7 @@ update_flowFrame_keywords <- function(flowFrame, exprs.m, desc = NULL, data.rang
         keyval[[n]] <- colnames(exprs.m)[i]
 
         if(data.range == "data")
-            keyval[[r]] <- ceiling(max(exprs.m[,i]))
+            keyval[[r]] <- ceiling(max(exprs.m[,i], na.rm = TRUE))
         else if(is.numeric(data.range))
             keyval[[r]] <- data.range
         else
@@ -38,8 +38,8 @@ update_flowFrame_keywords <- function(flowFrame, exprs.m, desc = NULL, data.rang
         flowCore::keyword(flowFrame) <- keyval
 
 
-        pdata[i,"minRange"] <- min(exprs.m[,i])
-        pdata[i,"maxRange"] <- max(exprs.m[,i])
+        pdata[i,"minRange"] <- min(exprs.m[,i], na.rm = TRUE)
+        pdata[i,"maxRange"] <- max(exprs.m[,i], na.rm = TRUE)
 
     }