refactor + fix dimnames bug

Author: mschubert

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: narray
 Title: R Package for Handling Arrays in a Consistent Manner
-Version: 0.1.0
+Version: 0.1.1
 Author: Michael Schubert <mschu.dev@gmail.com>
 Maintainer: Michael Schubert <mschu.dev@gmail.com>
 Description: Provides functions to query and manipulate arrays

R/dimnames.r

@@ -10,11 +10,15 @@
 #' @export
 dimnames = function(x, along=TRUE, null_as_integer=FALSE, drop=TRUE) {
     if (is.list(x) && !is.data.frame(x))
-        return(lapply(x, dimnames))
+        return(lapply(x, function(x1) dimnames(x1, along=along,
+                    null_as_integer=null_as_integer, drop=drop)))
     if (is.data.frame(x))
         x = as.matrix(x)
+    if (is.vector(x))
+        x = as.array(x)
 
     dn = base::dimnames(x)
+
     if (is.null(dn))
         dn = rep(list(NULL), length(dim(x)))
 

R/helpers.r R/match.rR/helpers.r renamed to R/match.r

@@ -52,7 +52,8 @@ match = function(x, from, to, filter_from=NULL, filter_to=NULL, data=parent.fram
 
     # remove identical mappings, then map ambivalent to NA
     df = data.frame(from=from, to=to)
-	df = df[!duplicated(df$from) | rev(duplicated(rev(df$from)))] = NA
+	df = df[!duplicated(df),]
+	df[duplicated(df$from) | rev(duplicated(rev(df$from))),] = NA
 	df = df[!duplicated(df),]
     from = df$from
     to = df$to
@@ -104,39 +105,3 @@ match = function(x, from, to, filter_from=NULL, filter_to=NULL, data=parent.fram
     else
         stats::setNames(to, x)
 }
-
-#' duplicated() function with extended functionality
-#'
-#' @param x       Object to check for duplicates on
-#' @param ...     Arguments to be passed to R's `duplicated()`
-#' @param all     Return all instances of duplicated entries
-#' @param random  Randomly select with entry is marked as duplicate
-duplicated = function(x, ..., all=F, random=F) {
-    if (all && random)
-        stop("Can not return all and randomly selected duplicates")
-
-    if (all)
-        base::duplicated(x, ...) | base::duplicated(x, ..., fromLast=TRUE)
-    else if (random) { # stat.ethz.ch/pipermail/r-help/2010-June/241244.html
-        if ( is.vector(x) ) {
-            permutation = sample(length(x))
-            x.perm      = x[permutation]
-            result.perm = duplicated(x.perm, ...)
-            result      = result.perm[order(permutation)]
-            return(result)
-        }
-        else if ( is.matrix(x) ) {
-            permutation = sample(nrow(x))
-            x.perm      = x[permutation,]
-            result.perm = duplicated(x.perm, ...)
-            result      = result.perm[order(permutation)]
-            return(result)
-        }
-        else {
-            stop(paste("duplicated.random() only supports vectors",
-            "matrices for now."))
-        }
-    }
-    else
-        base::duplicated(x, ...)
-}