Skip to content

Commit 4df2535

Browse files
committed
fixing backtest truth data plot
1 parent 7304110 commit 4df2535

File tree

7 files changed

+27
-15
lines changed

7 files changed

+27
-15
lines changed

README.Rmd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,8 @@ And as a tibble of quantile level-value pairs:
330330
```{r pivot_wider}
331331
four_week_ahead$predictions |>
332332
select(-.pred) |>
333-
pivot_quantiles_longer(.pred_distn)
333+
pivot_quantiles_longer(.pred_distn) |>
334+
select(geo_value, forecast_date, target_date, quantile = .pred_distn_quantile_level, value = .pred_distn_value)
334335
```
335336

336337
The yellow dot gives the median prediction, while the blue intervals give the

README.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -294,16 +294,17 @@ And as a tibble of quantile level-value pairs:
294294
``` r
295295
four_week_ahead$predictions |>
296296
select(-.pred) |>
297-
pivot_quantiles_longer(.pred_distn)
297+
pivot_quantiles_longer(.pred_distn) |>
298+
select(geo_value, forecast_date, target_date, quantile = .pred_distn_quantile_level, value = .pred_distn_value)
298299
#> # A tibble: 20 × 5
299-
#> geo_value values quantile_levels forecast_date target_date
300-
#> <chr> <dbl> <dbl> <date> <date>
301-
#> 1 ca 0.0425 0.1 2021-08-01 2021-08-29
302-
#> 2 ca 0.0803 0.25 2021-08-01 2021-08-29
303-
#> 3 ca 0.115 0.5 2021-08-01 2021-08-29
304-
#> 4 ca 0.150 0.75 2021-08-01 2021-08-29
305-
#> 5 ca 0.187 0.9 2021-08-01 2021-08-29
306-
#> 6 ma 0 0.1 2021-08-01 2021-08-29
300+
#> geo_value forecast_date target_date quantile value
301+
#> <chr> <date> <date> <dbl> <dbl>
302+
#> 1 ca 2021-08-01 2021-08-29 0.1 0.198
303+
#> 2 ca 2021-08-01 2021-08-29 0.25 0.285
304+
#> 3 ca 2021-08-01 2021-08-29 0.5 0.345
305+
#> 4 ca 2021-08-01 2021-08-29 0.75 0.405
306+
#> 5 ca 2021-08-01 2021-08-29 0.9 0.491
307+
#> 6 ma 2021-08-01 2021-08-29 0.1 0.0277
307308
#> # ℹ 14 more rows
308309
```
309310

man/figures/README-date-1.png

37.8 KB
Loading
26.8 KB
Loading
30.3 KB
Loading

vignettes/backtesting.Rmd

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -320,17 +320,27 @@ geo_choose <- "ca"
320320
forecasts_filtered <- forecasts |>
321321
filter(geo_value == geo_choose) |>
322322
mutate(time_value = version)
323+
# we need to add the ground truth data to the version faithful plot as well
324+
plotting_data <- bind_rows(
325+
percent_cli_data,
326+
percent_cli_data %>%
327+
filter(version_faithful == "Version un-faithful") %>%
328+
mutate(version_faithful = "Version faithful")
329+
)
323330
324331
p1 <- # first plotting the forecasts as bands, lines and points
325332
ggplot(data = forecasts_filtered, aes(x = target_date, group = time_value)) +
326333
geom_ribbon(aes(ymin = `0.05`, ymax = `0.95`, fill = factor(time_value)), alpha = 0.4) +
327334
geom_line(aes(y = .pred, color = factor(time_value)), linetype = 2L) +
328335
geom_point(aes(y = .pred, color = factor(time_value)), size = 0.75) +
329336
# the forecast date
330-
geom_vline(data = percent_cli_data |> filter(geo_value == geo_choose) |> select(-version_faithful), aes(color = factor(version), xintercept = version), lty = 2) +
337+
geom_vline(
338+
data = percent_cli_data |> filter(geo_value == geo_choose) |> select(-version_faithful),
339+
aes(color = factor(version), xintercept = version),
340+
lty = 2) +
331341
# the underlying data
332342
geom_line(
333-
data = percent_cli_data |> filter(geo_value == geo_choose),
343+
data = plotting_data |> filter(geo_value == geo_choose),
334344
aes(x = time_value, y = percent_cli, color = factor(version)),
335345
inherit.aes = FALSE, na.rm = TRUE
336346
) +
@@ -357,7 +367,7 @@ p2 <-
357367
aes(color = factor(version), xintercept = version), lty = 2
358368
) +
359369
geom_line(
360-
data = percent_cli_data |> filter(geo_value == geo_choose),
370+
data = plotting_data |> filter(geo_value == geo_choose),
361371
aes(x = time_value, y = percent_cli, color = factor(version)),
362372
inherit.aes = FALSE, na.rm = TRUE
363373
) +

vignettes/epipredict.Rmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
2-
title: "Get started with epipredict"
2+
title: "Get started with `epipredict`"
33
output: rmarkdown::html_vignette
44
vignette: >
5-
%\VignetteIndexEntry{Get started with `{epipredict}`}
5+
%\VignetteIndexEntry{Get started with `epipredict`}
66
%\VignetteEngine{knitr::rmarkdown}
77
%\VignetteEncoding{UTF-8}
88
---

0 commit comments

Comments
 (0)