Remove remaining is.na(useNames) [#246]

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: matrixStats
-Version: 1.4.1-9006
+Version: 1.4.1-9007
 Depends:
   R (>= 3.4.0)
 Suggests:

R/rowAlls.R

@@ -99,7 +99,7 @@ rowAlls <- function(x, rows = NULL, cols = NULL, value = TRUE,
       z <- (x == value)
       dim <- dim(x) # for 0xN and Mx0 cases; needed in R (< 3.4.0)
       if (!identical(dim(z), as.integer(dim))) dim(z) <- dim
-      if (isTRUE(useNames)) dimnames(z) <- dimnames(x)
+      if (useNames) dimnames(z) <- dimnames(x)
       return(rowAlls(z, na.rm = na.rm, dim. = dim., ..., useNames = useNames))
     }
   }
@@ -156,7 +156,7 @@ colAlls <- function(x, rows = NULL, cols = NULL, value = TRUE,
       z <- (x == value)
       dim <- dim(x) # for 0xN and Mx0 cases; needed in R (< 3.4.0)
       if (!identical(dim(z), as.integer(dim))) dim(z) <- dim
-      if (isTRUE(useNames)) dimnames(z) <- dimnames(x)
+      if (useNames) dimnames(z) <- dimnames(x)
       return(colAlls(z, na.rm = na.rm, dim. = dim., ..., useNames = useNames))
     }
   }
@@ -231,7 +231,7 @@ rowAnys <- function(x, rows = NULL, cols = NULL, value = TRUE,
       z <- (x == value)
       dim <- dim(x) # for 0xN and Mx0 cases; needed in R (< 3.4.0)
       if (!identical(dim(z), as.integer(dim))) dim(z) <- dim
-      if (isTRUE(useNames)) dimnames(z) <- dimnames(x)
+      if (useNames) dimnames(z) <- dimnames(x)
       return(rowAnys(z, na.rm = na.rm, dim. = dim., ..., useNames = useNames))
     }
   }
@@ -276,7 +276,7 @@ colAnys <- function(x, rows = NULL, cols = NULL, value = TRUE,
       z <- (x == value)
       dim <- dim(x) # for 0xN and Mx0 cases; needed in R (< 3.4.0)
       if (!identical(dim(z), as.integer(dim))) dim(z) <- dim
-      if (isTRUE(useNames)) dimnames(z) <- dimnames(x)
+      if (useNames) dimnames(z) <- dimnames(x)
       return(colAnys(z, na.rm = na.rm, dim. = dim., ..., useNames = useNames))
     }
   }

R/rowQuantiles.R

@@ -16,7 +16,7 @@
 #' @param digits An \code{\link[base]{integer}} specifying the precision of
 #' the formatted percentages. Not used when `useNames = FALSE`.
 #' In **matrixStats** (< 0.63.0), the default used to be
-#' `max(2L, getOption("digits"))` inline with R (< 4.1.0).
+#' `max(2L, getOption("digits"))` in line with R (< 4.1.0).
 #'
 #' @param ... Additional arguments passed to \code{\link[stats]{quantile}}.
 #'

R/rowWeightedMeans.R

@@ -69,15 +69,13 @@ rowWeightedMeans <- function(x, w = NULL, rows = NULL, cols = NULL,
       res <- rep(NaN, times = m)
 
       # Update names attribute?
-      if (!is.na(useNames)) {
-        if (useNames) {
-          names <- rownames(x)
-          if (!is.null(names)) {
-            names(res) <- names
-          }
-        } else {
-          names(res) <- NULL
+      if (useNames) {
+        names <- rownames(x)
+        if (!is.null(names)) {
+          names(res) <- names
         }
+      } else {
+        names(res) <- NULL
       }
 
       return(res)
@@ -113,7 +111,7 @@ rowWeightedMeans <- function(x, w = NULL, rows = NULL, cols = NULL,
       x <- W * x
 
       # Preserve dimnames attribute?
-      if (!(is.na(useNames) || useNames)) {
+      if (!useNames) {
         dimnames(x) <- NULL
       }
 
@@ -132,14 +130,12 @@ rowWeightedMeans <- function(x, w = NULL, rows = NULL, cols = NULL,
       x <- t_tx_OP_y(x, w, OP = "*", na.rm = FALSE)
 
       # Update dimnames attribute?
-      if (!is.na(useNames)) {
-        if (useNames) {
-          if (!is.null(dimnames)) {
-            dimnames(x) <- dimnames
-          }
-        } else {
-          dimnames(x) <- NULL
+      if (useNames) {
+        if (!is.null(dimnames)) {
+          dimnames(x) <- dimnames
         }
+      } else {
+        dimnames(x) <- NULL
       }
 
       w <- NULL  # Not needed anymore
@@ -151,7 +147,7 @@ rowWeightedMeans <- function(x, w = NULL, rows = NULL, cols = NULL,
     res <- rowMeans(x, na.rm = na.rm)
 
     # Preserve names attribute?
-    if (!(is.na(useNames) || useNames)) {
+    if (!useNames) {
       names(res) <- NULL
     }
   }
@@ -206,17 +202,15 @@ colWeightedMeans <- function(x, w = NULL,  rows = NULL, cols = NULL,
       res <- rep(NaN, times = m)
 
       # Update names attribute?
-      if (!is.na(useNames)) {
-        if (useNames) {
-          names <- colnames(x)
-          if (!is.null(names)) {
-            names(res) <- names
-          }
-        } else {
-          names(res) <- NULL
+      if (useNames) {
+        names <- colnames(x)
+        if (!is.null(names)) {
+          names(res) <- names
         }
-      }      
-
+      } else {
+        names(res) <- NULL
+      }
+
       return(res)
     } else if (nw < n) {
       w <- w[idxs]
@@ -271,7 +265,7 @@ colWeightedMeans <- function(x, w = NULL,  rows = NULL, cols = NULL,
   }
 
   # Preserve names attribute?
-  if (!(is.na(useNames) || useNames)) {
+  if (!useNames) {
     names(res) <- NULL
   }
 

R/rowWeightedMedians.R

@@ -68,7 +68,7 @@ rowWeightedMedians <- function(x, w = NULL, rows = NULL, cols = NULL,
     })
 
     # Preserve names attribute?
-    if (!(is.na(useNames) || useNames)) {
+    if (!useNames) {
       names(res) <- NULL
     }
 
@@ -125,7 +125,7 @@ colWeightedMedians <- function(x, w = NULL, rows = NULL, cols = NULL,
     })
 
     # Preserve names attribute?
-    if (!(is.na(useNames) || useNames)) {
+    if (!useNames) {
       names(res) <- NULL
     }