Merge pull request #43 from epiforecasts/fix_cases

added scores argument pass to cases
epiforecasts · Apr 18, 2020 · e365927 · e365927
2 parents b5d4b88 + df74a04
commit e365927
Show file tree

Hide file tree

Showing 30 changed files with 479 additions and 449 deletions.
diff --git a/R/score_case_forecast.R b/R/score_case_forecast.R
@@ -8,6 +8,7 @@
 #' logs, bias, and sharpness as well as the forecast date and time horizon.
 #' @export
 #'
+#' @inheritParams score_forecast
 #' @importFrom dplyr rename
 #' @examples
 #' ## Fit a model (using a subset of observations)
@@ -21,13 +22,18 @@
 #'
 #' ## Score the model fit (with observations during the time horizon of the forecast)
 #' score_case_forecast(pred_cases, EpiSoon::example_obs_cases)
-score_case_forecast <- function(pred_cases, obs_cases) {
+#'
+#'
+#' ## Score the model fit (with observations during the time horizon of the forecast)
+#' score_case_forecast(pred_cases, EpiSoon::example_obs_cases, scores = c("crps", "sharpness", "bias"))
+score_case_forecast <- function(pred_cases, obs_cases, scores = "all") {
 
   pred_cases <-  dplyr::rename(pred_cases, rt = cases)
 
-  obs_cases <- dplyr::rename( obs_cases, rt = cases)
+  obs_cases <- dplyr::rename(obs_cases, rt = cases)
 
-  scores <- EpiSoon::score_forecast(pred_cases, obs_cases)
+  scores <- EpiSoon::score_forecast(pred_cases, obs_cases,
+                                    scores = scores)
 
   return(scores)
 }

diff --git a/docs/articles/introduction.html b/docs/articles/introduction.html
diff --git a/docs/articles/introduction_files/figure-html/unnamed-chunk-15-1.png b/docs/articles/introduction_files/figure-html/unnamed-chunk-15-1.png
diff --git a/docs/articles/introduction_files/figure-html/unnamed-chunk-19-1.png b/docs/articles/introduction_files/figure-html/unnamed-chunk-19-1.png
diff --git a/docs/articles/introduction_files/figure-html/unnamed-chunk-20-1.png b/docs/articles/introduction_files/figure-html/unnamed-chunk-20-1.png
diff --git a/docs/articles/introduction_files/figure-html/unnamed-chunk-8-1.png b/docs/articles/introduction_files/figure-html/unnamed-chunk-8-1.png
diff --git a/docs/reference/bsts_model.html b/docs/reference/bsts_model.html
diff --git a/docs/reference/compare_models-1.png b/docs/reference/compare_models-1.png
diff --git a/docs/reference/compare_models-2.png b/docs/reference/compare_models-2.png
diff --git a/docs/reference/compare_timeseries-1.png b/docs/reference/compare_timeseries-1.png
diff --git a/docs/reference/compare_timeseries-2.png b/docs/reference/compare_timeseries-2.png