Fix map seasonality plots (#110)

* compute seasonality even for map * update test plots * update ignore files * try to fix test for windows
jasp-stats · Dec 5, 2024 · 705b93f · 705b93f
1 parent bb08d21
commit 705b93f
Show file tree

Hide file tree

Showing 22 changed files with 960 additions and 956 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -1,3 +1,5 @@
+^renv$
+^renv\.lock$
 ^.*\.Rproj$
 ^\.Rproj\.user$
 ^\.travis\.yml$

diff --git a/.gitignore b/.gitignore
@@ -58,3 +58,5 @@ Thumbs.db
 # RStudio files
 .Rproj.user
 _processedLockFile.lock
+.Rprofile
+renv/
diff --git a/R/prophet.R b/R/prophet.R
@@ -366,6 +366,14 @@ Prophet <- function(jaspResults, dataset = NULL, options) {
 }
 
 .prophetModelResultsReduce <- function(prophetModelResults, options) {
+  # seasonality estimates
+  predictedSeasonalities <- list()
+  for (seas in options[["seasonalities"]]) {
+    name <- seas[["name"]]
+    predictedSeasonalities[[name]] <- .prophetPredictSeasonality(name, prophetModelResults, options)
+  }
+  prophetModelResults[["predictedSeasonalities"]] <- predictedSeasonalities
+
   if (options$estimation == "mcmc") {
     # posterior summaries
     ci <- .prophetIntervalLevels(options, "credible")
@@ -383,14 +391,6 @@ Prophet <- function(jaspResults, dataset = NULL, options) {
     }
     prophetModelResults[["parameterDensities"]] <- parameterDensities
 
-    # seasonality estimates
-    predictedSeasonalities <- list()
-    for (seas in options[["seasonalities"]]) {
-      name <- seas[["name"]]
-      predictedSeasonalities[[name]] <- .prophetPredictSeasonality(name, prophetModelResults, options)
-    }
-    prophetModelResults[["predictedSeasonalities"]] <- predictedSeasonalities
-
     # remove stanfit and mcmc samples from the results to reduce size of the results
     prophetModelResults$stan.fit <- NULL
     prophetModelResults$params   <- NULL

diff --git a/tests/testthat/_snaps/prophet/changepoint-plotdays.svg b/tests/testthat/_snaps/prophet/changepoint-plotdays.svg
diff --git a/tests/testthat/_snaps/prophet/changepoint-plothours.svg b/tests/testthat/_snaps/prophet/changepoint-plothours.svg
diff --git a/tests/testthat/_snaps/prophet/changepoint-plotmins.svg b/tests/testthat/_snaps/prophet/changepoint-plotmins.svg
diff --git a/tests/testthat/_snaps/prophet/changepoint-plotsecs.svg b/tests/testthat/_snaps/prophet/changepoint-plotsecs.svg
diff --git a/tests/testthat/_snaps/prophet/changepoint-plotweeks.svg b/tests/testthat/_snaps/prophet/changepoint-plotweeks.svg
diff --git a/tests/testthat/_snaps/prophet/changepoint-plotyears.svg b/tests/testthat/_snaps/prophet/changepoint-plotyears.svg
diff --git a/tests/testthat/_snaps/prophet/covariate-plot-multi.svg b/tests/testthat/_snaps/prophet/covariate-plot-multi.svg
diff --git a/tests/testthat/_snaps/prophet/custom-seasonality-plot-days.svg b/tests/testthat/_snaps/prophet/custom-seasonality-plot-days.svg
diff --git a/tests/testthat/_snaps/prophet/custom-seasonality-plot-hours.svg b/tests/testthat/_snaps/prophet/custom-seasonality-plot-hours.svg
diff --git a/tests/testthat/_snaps/prophet/custom-seasonality-plot-mins.svg b/tests/testthat/_snaps/prophet/custom-seasonality-plot-mins.svg
diff --git a/tests/testthat/_snaps/prophet/custom-seasonality-plot-multi.svg b/tests/testthat/_snaps/prophet/custom-seasonality-plot-multi.svg
diff --git a/tests/testthat/_snaps/prophet/custom-seasonality-plot-secs.svg b/tests/testthat/_snaps/prophet/custom-seasonality-plot-secs.svg
diff --git a/tests/testthat/_snaps/prophet/custom-seasonality-plot-weeks.svg b/tests/testthat/_snaps/prophet/custom-seasonality-plot-weeks.svg
diff --git a/tests/testthat/_snaps/prophet/custom-seasonality-plot-years.svg b/tests/testthat/_snaps/prophet/custom-seasonality-plot-years.svg
diff --git a/tests/testthat/_snaps/prophet/growth-rate.svg b/tests/testthat/_snaps/prophet/growth-rate.svg
diff --git a/tests/testthat/_snaps/prophet/offset.svg b/tests/testthat/_snaps/prophet/offset.svg
diff --git a/tests/testthat/_snaps/prophet/residual-variance.svg b/tests/testthat/_snaps/prophet/residual-variance.svg
diff --git a/tests/testthat/_snaps/prophet/trend-forecast-plot.svg b/tests/testthat/_snaps/prophet/trend-forecast-plot.svg
diff --git a/tests/testthat/test-prophet.R b/tests/testthat/test-prophet.R
@@ -186,7 +186,7 @@ test_that("Parameter Estimates Table results match (MAP)", {
   {
     # test windows result
     testthat::skip_on_os(c("mac", "linux"))
-    jaspTools::expect_equal_tables(table, list(-2.50859195109382, -2.31656506358638, 0.32805219661169))
+    jaspTools::expect_equal_tables(table, list(-2.50358957234044, -2.32147823235013, 0.328046513061461))
   }
 
   {