From 1620fa3cb246ca685b519b5cf0bbd5fd42b7a202 Mon Sep 17 00:00:00 2001
From: aho <an.ho@bsc.es>
Date: Fri, 22 Jan 2021 13:00:15 +0100
Subject: [PATCH 1/3] Make Season accept 1D array when ncores = 1 or NULL

---
 R/Season.R                   | 20 +++++++++++++-------
 tests/testthat/test-Season.R | 26 ++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/R/Season.R b/R/Season.R
index 7bc5c52..50cc429 100644
--- a/R/Season.R
+++ b/R/Season.R
@@ -127,14 +127,20 @@ Season <- function(data, time_dim = 'ftime', monini, moninf, monsup,
     }
 
     if (use_apply) {
-      time_dim_ind <- match(time_dim, names(dim(data)))
-      res <- apply(data, c(1:length(dim(data)))[-time_dim_ind], .Season,
-                   monini = monini, moninf = moninf, monsup = monsup,
-                   method = method, na.rm = na.rm)
-      if (length(dim(res)) < length(dim(data))) {
-        res <- InsertDim(res, posdim = 1, lendim = 1, name = time_dim)
+      if (length(dim(data)) == 1) {
+        res <- .Season(data, monini = monini, moninf = moninf, monsup = monsup,
+                       method = method, na.rm = na.rm)
+        names(dim(res)) <- time_dim
       } else {
-        names(dim(res))[1] <- time_dim
+        time_dim_ind <- match(time_dim, names(dim(data)))
+        res <- apply(data, c(1:length(dim(data)))[-time_dim_ind], .Season,
+                     monini = monini, moninf = moninf, monsup = monsup,
+                     method = method, na.rm = na.rm)
+        if (length(dim(res)) < length(dim(data))) {
+          res <- InsertDim(res, posdim = 1, lendim = 1, name = time_dim)
+        } else {
+          names(dim(res))[1] <- time_dim
+        }
       }
 
     } else {
diff --git a/tests/testthat/test-Season.R b/tests/testthat/test-Season.R
index 36c3027..2482042 100644
--- a/tests/testthat/test-Season.R
+++ b/tests/testthat/test-Season.R
@@ -11,6 +11,10 @@ context("s2dv::Season tests")
   na <- floor(runif(30, min = 1, max = 144*3))
   dat2[na] <- NA
 
+  # dat3
+  set.seed(1)
+  dat3 <- array(rnorm(12), dim = c(ftime = 12))
+
 ##############################################
 test_that("1. Input checks", {
 
@@ -161,4 +165,26 @@ test_that("3. Output checks: dat2", {
 })
 
 ##############################################
+test_that("3. Output checks: dat3", {
+  expect_equal(
+    Season(dat3, monini = 10, moninf = 12, monsup = 2),
+    0.3630533,
+    tolerance = 0.0001
+  )
+  expect_equal(
+    dim(Season(dat3, monini = 10, moninf = 12, monsup = 2)),
+    c(ftime = 1)
+  )
+  expect_equal(
+    Season(dat3, monini = 10, moninf = 12, monsup = 2, ncores = 2),
+    0.3630533,
+    tolerance = 0.0001
+  )
+  expect_equal(
+    dim(Season(dat3, monini = 10, moninf = 12, monsup = 2, ncores = 2)),
+    c(ftime = 1)
+  )
 
+})
+
+##############################################
-- 
GitLab


From 05c2c95f2e6a1bf65bda0f770cf0ab95bd7f7f91 Mon Sep 17 00:00:00 2001
From: aho <an.ho@bsc.es>
Date: Fri, 22 Jan 2021 13:11:55 +0100
Subject: [PATCH 2/3] Remove ncores = 2 test

---
 tests/testthat/test-Season.R | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/testthat/test-Season.R b/tests/testthat/test-Season.R
index 2482042..0b009a6 100644
--- a/tests/testthat/test-Season.R
+++ b/tests/testthat/test-Season.R
@@ -167,7 +167,7 @@ test_that("3. Output checks: dat2", {
 ##############################################
 test_that("3. Output checks: dat3", {
   expect_equal(
-    Season(dat3, monini = 10, moninf = 12, monsup = 2),
+    as.numeric(Season(dat3, monini = 10, moninf = 12, monsup = 2)),
     0.3630533,
     tolerance = 0.0001
   )
@@ -175,16 +175,16 @@ test_that("3. Output checks: dat3", {
     dim(Season(dat3, monini = 10, moninf = 12, monsup = 2)),
     c(ftime = 1)
   )
-  expect_equal(
-    Season(dat3, monini = 10, moninf = 12, monsup = 2, ncores = 2),
-    0.3630533,
-    tolerance = 0.0001
-  )
-  expect_equal(
-    dim(Season(dat3, monini = 10, moninf = 12, monsup = 2, ncores = 2)),
-    c(ftime = 1)
-  )
+#  expect_equal(
+#    Season(dat3, monini = 10, moninf = 12, monsup = 2, ncores = 2),
+#    0.3630533,
+#    tolerance = 0.0001
+#  )
+#  expect_equal(
+#    dim(Season(dat3, monini = 10, moninf = 12, monsup = 2, ncores = 2)),
+#    c(ftime = 1)
+#  )
 
 })
 
-##############################################
+###############################################
-- 
GitLab


From d7a955dbaafe3c596ffb222327fc0ab480b46715 Mon Sep 17 00:00:00 2001
From: aho <an.ho@bsc.es>
Date: Fri, 22 Jan 2021 13:25:12 +0100
Subject: [PATCH 3/3] Update MeanDims.Rd

---
 man/MeanDims.Rd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/MeanDims.Rd b/man/MeanDims.Rd
index f200023..adff306 100644
--- a/man/MeanDims.Rd
+++ b/man/MeanDims.Rd
@@ -4,7 +4,7 @@
 \alias{MeanDims}
 \title{Average an array along multiple dimensions}
 \usage{
-MeanDims(data, dims, na.rm = TRUE, ncores = NULL)
+MeanDims(data, dims, na.rm = FALSE, ncores = NULL)
 }
 \arguments{
 \item{data}{An array to be averaged.}
-- 
GitLab