Skip to content

Commit 705b93f

Browse files
authored
Fix map seasonality plots (#110)
* compute seasonality even for map * update test plots * update ignore files * try to fix test for windows
1 parent bb08d21 commit 705b93f

22 files changed

+960
-956
lines changed

.Rbuildignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
^renv$
2+
^renv\.lock$
13
^.*\.Rproj$
24
^\.Rproj\.user$
35
^\.travis\.yml$

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,5 @@ Thumbs.db
5858
# RStudio files
5959
.Rproj.user
6060
_processedLockFile.lock
61+
.Rprofile
62+
renv/

R/prophet.R

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,14 @@ Prophet <- function(jaspResults, dataset = NULL, options) {
366366
}
367367

368368
.prophetModelResultsReduce <- function(prophetModelResults, options) {
369+
# seasonality estimates
370+
predictedSeasonalities <- list()
371+
for (seas in options[["seasonalities"]]) {
372+
name <- seas[["name"]]
373+
predictedSeasonalities[[name]] <- .prophetPredictSeasonality(name, prophetModelResults, options)
374+
}
375+
prophetModelResults[["predictedSeasonalities"]] <- predictedSeasonalities
376+
369377
if (options$estimation == "mcmc") {
370378
# posterior summaries
371379
ci <- .prophetIntervalLevels(options, "credible")
@@ -383,14 +391,6 @@ Prophet <- function(jaspResults, dataset = NULL, options) {
383391
}
384392
prophetModelResults[["parameterDensities"]] <- parameterDensities
385393

386-
# seasonality estimates
387-
predictedSeasonalities <- list()
388-
for (seas in options[["seasonalities"]]) {
389-
name <- seas[["name"]]
390-
predictedSeasonalities[[name]] <- .prophetPredictSeasonality(name, prophetModelResults, options)
391-
}
392-
prophetModelResults[["predictedSeasonalities"]] <- predictedSeasonalities
393-
394394
# remove stanfit and mcmc samples from the results to reduce size of the results
395395
prophetModelResults$stan.fit <- NULL
396396
prophetModelResults$params <- NULL

tests/testthat/_snaps/prophet/changepoint-plotdays.svg

Lines changed: 94 additions & 94 deletions
Loading

tests/testthat/_snaps/prophet/changepoint-plothours.svg

Lines changed: 90 additions & 90 deletions
Loading

tests/testthat/_snaps/prophet/changepoint-plotmins.svg

Lines changed: 94 additions & 94 deletions
Loading

tests/testthat/_snaps/prophet/changepoint-plotsecs.svg

Lines changed: 94 additions & 94 deletions
Loading

tests/testthat/_snaps/prophet/changepoint-plotweeks.svg

Lines changed: 90 additions & 90 deletions
Loading

tests/testthat/_snaps/prophet/changepoint-plotyears.svg

Lines changed: 90 additions & 90 deletions
Loading

tests/testthat/_snaps/prophet/covariate-plot-multi.svg

Lines changed: 166 additions & 166 deletions
Loading

0 commit comments

Comments
 (0)