From 6e830d3b0ade891bbeb21609fae5ed018ff7332c Mon Sep 17 00:00:00 2001 From: Nicolau Manubens Date: Tue, 15 Jan 2019 19:59:49 +0100 Subject: [PATCH 1/4] Fix in aperm2. --- R/Utils.R | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/R/Utils.R b/R/Utils.R index f4dd5e5..6f7b6a1 100644 --- a/R/Utils.R +++ b/R/Utils.R @@ -474,13 +474,23 @@ chunk <- function(chunk, n_chunks, selectors) { noBreaks. = noBreaks, domain = domain) } +# Function to permute arrays of non-atomic elements (e.g. POSIXct) # Function to permute arrays of non-atomic elements (e.g. POSIXct) .aperm2 <- function(x, new_order) { - y <- array(1:length(x), dim = dim(x)) - y <- aperm(y, new_order) old_dims <- dim(x) - x <- x[as.vector(y)] + attr_bk <- attributes(x) + if ('dim' %in% names(attr_bk)) { + attr_bk[['dim']] <- NULL + } + if (is.numeric(x)) { + x <- aperm(x, new_order) + } else { + y <- array(1:length(x), dim = dim(x)) + y <- aperm(y, new_order) + x <- x[as.vector(y)] + } dim(x) <- old_dims[new_order] + attributes(x) <- c(attributes(x), attr_bk) x } -- GitLab From ea2014ec11a29649f6725b481b166f7da596f051 Mon Sep 17 00:00:00 2001 From: Nicolau Manubens Date: Sat, 19 Jan 2019 00:40:22 +0100 Subject: [PATCH 2/4] Acknowledging Roberto's contribution. --- DESCRIPTION | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index a7bdd2b..603efdb 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -3,7 +3,8 @@ Title: Automatically Retrieve Multidimensional Distributed Data Sets Version: 0.0.2 Authors@R: c( person("BSC-CNS", role = c("aut", "cph")), - person("Nicolau", "Manubens", , "nicolau.manubens@bsc.es", role = c("aut", "cre"))) + person("Nicolau", "Manubens", , "nicolau.manubens@bsc.es", role = c("aut", "cre")) + person("Roberto", "Serrano", , "roberto.serrano@bsc.es", role = c("ctb"))) Description: Tool to automatically fetch, transform and arrange subsets of multidimensional data sets (collections of files) stored in local and/or remote file systems or servers, using multicore capabilities where possible. The tool provides an interface to perceive a collection of data sets as a single large multidimensional data array, and enables the user to request for automatic retrieval, processing and arrangement of subsets of the large array. Wrapper functions to add support for custom file formats can be plugged in/out, making the tool suitable for any research field where large multidimensional data sets are involved. Depends: R (>= 2.14.1) -- GitLab From 161fb1aeec0b3625c193c3c1530ca5832890d395 Mon Sep 17 00:00:00 2001 From: Nicolau Manubens Date: Mon, 21 Jan 2019 00:33:26 +0100 Subject: [PATCH 3/4] Added other contributors. --- DESCRIPTION | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 603efdb..24f05dd 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -3,7 +3,9 @@ Title: Automatically Retrieve Multidimensional Distributed Data Sets Version: 0.0.2 Authors@R: c( person("BSC-CNS", role = c("aut", "cph")), - person("Nicolau", "Manubens", , "nicolau.manubens@bsc.es", role = c("aut", "cre")) + person("Nicolau", "Manubens", , "nicolau.manubens@bsc.es", role = c("aut", "cre")), + person("Javier", "Vegas", , "javier.vegas@bsc.es", role = c("ctb")), + person("Pierre-Antoine", "Bretonniere", , "pierre-antoine.bretonniere@bsc.es", role = c("ctb")), person("Roberto", "Serrano", , "roberto.serrano@bsc.es", role = c("ctb"))) Description: Tool to automatically fetch, transform and arrange subsets of multidimensional data sets (collections of files) stored in local and/or remote file systems or servers, using multicore capabilities where possible. The tool provides an interface to perceive a collection of data sets as a single large multidimensional data array, and enables the user to request for automatic retrieval, processing and arrangement of subsets of the large array. Wrapper functions to add support for custom file formats can be plugged in/out, making the tool suitable for any research field where large multidimensional data sets are involved. Depends: -- GitLab From c5c91b48223dfc56e348e8ebfbfa9226c30d62be Mon Sep 17 00:00:00 2001 From: Nicolau Manubens Date: Mon, 21 Jan 2019 13:52:48 +0100 Subject: [PATCH 4/4] Updated Roberto's email. --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 24f05dd..3d083af 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -6,7 +6,7 @@ Authors@R: c( person("Nicolau", "Manubens", , "nicolau.manubens@bsc.es", role = c("aut", "cre")), person("Javier", "Vegas", , "javier.vegas@bsc.es", role = c("ctb")), person("Pierre-Antoine", "Bretonniere", , "pierre-antoine.bretonniere@bsc.es", role = c("ctb")), - person("Roberto", "Serrano", , "roberto.serrano@bsc.es", role = c("ctb"))) + person("Roberto", "Serrano", , "rsnotivoli@gmal.com", role = c("ctb"))) Description: Tool to automatically fetch, transform and arrange subsets of multidimensional data sets (collections of files) stored in local and/or remote file systems or servers, using multicore capabilities where possible. The tool provides an interface to perceive a collection of data sets as a single large multidimensional data array, and enables the user to request for automatic retrieval, processing and arrangement of subsets of the large array. Wrapper functions to add support for custom file formats can be plugged in/out, making the tool suitable for any research field where large multidimensional data sets are involved. Depends: R (>= 2.14.1) -- GitLab