Up

Signed-off-by: Daena Rys <[email protected]>
microbiome · May 21, 2024 · 0493a7f · 0493a7f
1 parent 72c912d
commit 0493a7f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: mia
 Type: Package
-Version: 1.13.14
+Version: 1.13.15
 Authors@R:
     c(person(given = "Felix G.M.", family = "Ernst", role = c("aut"),
              email = "[email protected]",

diff --git a/NEWS b/NEWS
@@ -130,3 +130,4 @@ Changes in version 1.13.x
 + Rename subsampleCounts to rarefyAssay
 + Rename perSampleDominant* functions to getDominant and addPerSampleDominant* 
   functions to addDominant
++ Fix bug in mergeFeaturesByPrevalence
diff --git a/R/merge.R b/R/merge.R
@@ -13,9 +13,9 @@
             call. = FALSE)
     }
     # This is done otherwise we lose NA values
-    if ( !na.rm && any(is.na(f)) ) {
-      f <- as.character(f)
-      f[is.na(f)] <- "NA"
+    if (!na.rm && any(is.na(f))) {
+        f <- as.character(f)
+        f[ is.na(f) ] <- "NA"
     }
     if(is.character(f)){
         f <- factor(f)
@@ -125,7 +125,7 @@
 #' @importFrom scuttle summarizeAssayByGroup
 .merge_cols <- function(x, f, archetype = 1L, ...){
     # input check
-    if( .is_a_string(f) && f %in% colnames(rowData(x)) ){
+    if( .is_a_string(f) && f %in% colnames(colData(x)) ){
       f <- colData(x)[[ f ]]
     }
     f <- .norm_f(ncol(x), f, "columns")