Merge pull request #12 from KWB-R/dev

Release 0.5.1 (bug fix and minor change)

Author: hsonne

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: kwb.utils
 Title: General Utility Functions Developed at KWB
-Version: 0.5.0
+Version: 0.5.1
 Authors@R: 
     c(person(given = "Hauke",
              family = "Sonnenberg",
@@ -29,4 +29,4 @@ Suggests:
 VignetteBuilder: 
     knitr
 Encoding: UTF-8
-RoxygenNote: 6.1.1
+RoxygenNote: 7.1.0

NEWS.md

@@ -1,3 +1,11 @@
+# Current
+
+# [kwb.utils 0.5.1](https://github.com/KWB-R/kwb.utils/releases/tag/v0.5.1) <small>2020-04-20</small>
+
+* Fix bug in moveColumnsToFront(): keep data frame structure in case that the
+  data frame has only one column
+* createMatrix(): Set defaults for name.row and name.col to NULL (was: "")
+
 # [kwb.utils 0.5.0](https://github.com/KWB-R/kwb.utils/releases/tag/v0.5.0) <small>2019-12-17</small>
 
 * new: toPdf()

R/column.R

@@ -388,7 +388,7 @@ insertColumns <- function(
 #'   
 moveColumnsToFront <- function(x, columns = NULL)
 {
-  selectColumns(x, moveToFront(names(x), columns))
+  selectColumns(x, moveToFront(names(x), columns), drop = FALSE)
 }
 
 # pasteColumns -----------------------------------------------------------------

R/list.R

@@ -273,19 +273,16 @@ selectElements <- function(x, elements = NULL, do.stop = TRUE, do.warn = TRUE)
 
   L <- length(elements) 
 
-  result <- if (L == 0) {
-    
-    list()
-    
-  } else if (L == 1) {
-    
-    x[[elements]]
-    
-  } else {
-    
-    x[elements]
-  }
+  if (L == 0L) {
+    return(list())
+  } 
 
+  if (L == 1L) {
+    return(x[[elements]])
+  } 
+  
+  result <- x[elements]
+
   newNames <- names(elements)
 
   if (! is.null(newNames)) {

R/matrix.R

@@ -97,8 +97,8 @@ randomMatrix <- function(
 #' @param rowNames character vector of row names to be given to the matrix
 #' @param colNames character vector of column names to be given to the matrix
 #' @param value value to be given to each matrix element
-#' @param name.row name to be given to the row dimension (default: "")
-#' @param name.col name to be given to the column dimension (default: "")
+#' @param name.row optional. Name to be given to the row dimension
+#' @param name.col optional. Name to be given to the column dimension
 #' @return matrix with \code{rowNames} as row names and \code{colNames} as
 #'   column names, filled with \emph{value} at each position
 #' @export
@@ -116,7 +116,7 @@ randomMatrix <- function(
 #' createMatrix(c("A", "B", "C"), name.row = "Letters")
 #' 
 createMatrix <- function(
-  rowNames, colNames = rowNames, value = 0, name.row = "", name.col = ""
+  rowNames, colNames = rowNames, value = 0, name.row = NULL, name.col = NULL
 )
 {
   stopifnot(is.character(rowNames))
@@ -127,16 +127,14 @@ createMatrix <- function(
 
   dimnames <- list(rowNames, colNames)
 
-  if (! is.null(name.row)) {
+  if (! is.null(name.row) || ! is.null(name.col)) {
 
-    names(dimnames)[1] <- name.row
+    names(dimnames) <- c(
+      defaultIfNULL(name.row, ""), 
+      defaultIfNULL(name.col, "")
+    )
   }
-  
-  if (! is.null(name.col)) {
-    
-    names(dimnames)[2] <- name.col
-  }
-  
+
   matrix(
     data = rep(value, times = nrows * length(colNames)), 
     nrow = nrows,
@@ -274,7 +272,15 @@ diffrows <- function(x)
 {
   stopIfNotMatrix(x)
 
-  do.call(rbind, lapply(seq_len(nrow(x) - 1), function(i) x[i + 1, ] - x[i, ]))
+  rows <- lapply(seq_len(nrow(x) - 1L), function(i) x[i + 1L, ] - x[i, ])
+  
+  result <- do.call(rbind, rows)
+  
+  if (ncol(result) == 1L) {
+    colnames(result) <- colnames(x)
+  }
+  
+  result
 }
 
 # asColumnList -----------------------------------------------------------------