incorporating Evan's changes from PR #138. Also, updates to manuscrip…

…t, bib, and model table.
FluSightNetwork · May 20, 2018 · 495a666 · 495a666
1 parent 15872cc
commit 495a666
Show file tree

Hide file tree

Showing 4 changed files with 373 additions and 272 deletions.
diff --git a/scripts/point-estimate-scores.R b/scripts/point-estimate-scores.R
@@ -43,9 +43,11 @@ ests_with_truth <- tmp.df %>%
     dplyr::rename(Calendar.Week = `Calendar Week`) %>% 
     left_join(truths) %>%
     mutate(
+        target_type = ifelse(Target %in% c("Season peak week", "Season onset"), "Week", "wILI"),
         obs_value = as.numeric(as.character(Valid.Bin_start_incl)),
-        err = Value - obs_value
-        )
-
+        # todo: fix error calculation for week targets
+        err = ifelse(target_type == "wILI", Value - obs_value, Value - obs_value)
+    )
+
 
 write.csv(ests_with_truth, file="scores/point_ests.csv", quote = FALSE, row.names = FALSE)