From ed64097d79be118d8518eb1ce085156647ace8ca Mon Sep 17 00:00:00 2001 From: vagudets Date: Thu, 16 May 2024 14:27:42 +0200 Subject: [PATCH 1/3] Iterate over names instead of length when correcting 'sub_array_of_indices_by_file' --- R/Start.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/Start.R b/R/Start.R index 2be297b..98b2df3 100644 --- a/R/Start.R +++ b/R/Start.R @@ -3279,8 +3279,8 @@ Start <- function(..., # dim = indices/selectors, indices_chunk <- c(indices_chunk, rep(item, length(tmp) - length(indices_chunk))) } sub_array_of_indices_by_file <- split(sub_array_of_indices, indices_chunk) - for (item in 2:length(sub_array_of_indices_by_file)) { - sub_array_of_indices_by_file[[item]] <- sub_array_of_indices_by_file[[item]] - cumsum(inner_dim_lengths)[item - 1] + for (item in names(sub_array_of_indices_by_file)) { + sub_array_of_indices_by_file[[item]] <- sub_array_of_indices_by_file[[item]] - cumsum(inner_dim_lengths)[as.numeric(item) - 1] } transformed_indices <- unlist(sub_array_of_indices_by_file, use.names = FALSE) } -- GitLab From 7dc8481330c110870b83ca11bbd633ddc6196415 Mon Sep 17 00:00:00 2001 From: vagudets Date: Thu, 16 May 2024 16:22:02 +0200 Subject: [PATCH 2/3] Run unit tests on gitlab --- .Rbuildignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.Rbuildignore b/.Rbuildignore index aa7059a..39771b3 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -9,7 +9,7 @@ ^inst/doc$ ^\.gitlab-ci\.yml$ ## unit tests should be ignored when building the package for CRAN -^tests$ +# ^tests$ ^inst/PlotProfiling\.R$ ^.gitlab$ # Suggested by http://r-pkgs.had.co.nz/package.html -- GitLab From c3706ecab5e8e28937c36f7989bd012daa64cb3b Mon Sep 17 00:00:00 2001 From: Victoria Agudetse Roures Date: Fri, 17 May 2024 10:39:30 +0200 Subject: [PATCH 3/3] Do not apply sub_array_of_indices_by_file correction if item is 1 --- R/Start.R | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/R/Start.R b/R/Start.R index 98b2df3..42f72b6 100644 --- a/R/Start.R +++ b/R/Start.R @@ -3279,8 +3279,11 @@ Start <- function(..., # dim = indices/selectors, indices_chunk <- c(indices_chunk, rep(item, length(tmp) - length(indices_chunk))) } sub_array_of_indices_by_file <- split(sub_array_of_indices, indices_chunk) - for (item in names(sub_array_of_indices_by_file)) { - sub_array_of_indices_by_file[[item]] <- sub_array_of_indices_by_file[[item]] - cumsum(inner_dim_lengths)[as.numeric(item) - 1] + for (item in names((sub_array_of_indices_by_file))) { + # If item is 1, cumsum(inner_dim_lengths)[item - 1] returns numeric(0) + if (as.numeric(item) > 1) { + sub_array_of_indices_by_file[[item]] <- sub_array_of_indices_by_file[[item]] - cumsum(inner_dim_lengths)[as.numeric(item) - 1] + } } transformed_indices <- unlist(sub_array_of_indices_by_file, use.names = FALSE) } -- GitLab