From 2e22bd23b961ca85f9189007dcadefe410cf2f85 Mon Sep 17 00:00:00 2001 From: aho Date: Tue, 31 Mar 2020 18:44:35 +0200 Subject: [PATCH] Remove one check in Utils::chunk for split_dim. --- R/ByChunks.R | 2 ++ R/Utils.R | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/R/ByChunks.R b/R/ByChunks.R index 26d6662..17b3c20 100644 --- a/R/ByChunks.R +++ b/R/ByChunks.R @@ -589,6 +589,7 @@ ByChunks <- function(step_fun, cube_headers, ..., chunks = 'auto', startR:::.message(paste("Loading chunk", i, "out of", length(chunk_array), "...")) } + data <- vector('list', length(cube_headers)) t_begin_load <- Sys.time() for (input in 1:length(data)) { @@ -610,6 +611,7 @@ ByChunks <- function(step_fun, cube_headers, ..., chunks = 'auto', chunks_indices_split_dims[split_dims_to_alter] <- chunk_indices[names(split_dims[[k]])[split_dims_to_alter]] start_call[[names(split_dims)[k]]] <- chunk(chunks_indices_split_dims, chunks_split_dims, eval(start_call[[names(split_dims)[k]]])) + dims_to_alter_to_remove <- which(names_dims_to_alter %in% names(split_dims[[k]])) if (length(dims_to_alter_to_remove) > 0) { dims_to_alter <- dims_to_alter[-dims_to_alter_to_remove] diff --git a/R/Utils.R b/R/Utils.R index 0d2b2fd..c193cd7 100644 --- a/R/Utils.R +++ b/R/Utils.R @@ -30,10 +30,12 @@ chunk <- function(chunk, n_chunks, selectors) { if (length(chunk) != length(n_chunks)) { stop("Wrong chunk specification.") } - if (!is.null(attr(selectors, 'values'))) { - stop("Multidimensional chunking only available when selector ", - "values provided.") - } +#NOTE: 1. It should be for above? not nultidimensional selector +# 2. it was !is.null before, but it should be is.null (?) +# if (is.null(attr(selectors, 'values'))) { +# stop("Multidimensional chunking only available when selector ", +# "values provided.") +# } if (is.null(dim(selectors))) { stop("Multidimensional chunking only available when multidimensional ", "selector values provided.") -- GitLab