don't include the geo_agged by default anymore

dsweber2 · dsweber2 · commit 0637aff35920 · 2025-04-30T14:37:49.000-05:00
diff --git a/covid_geo_exclusions.csv b/covid_geo_exclusions.csv
@@ -9,9 +9,21 @@ forecast_date,forecaster,geo_value,weight
 2024-10-01, linear, all, 3
 2024-10-01, linearlog, all, 0
 2024-10-01, climate_base, all, 2
-2024-10-01, climate_geo_agged, all, 0.5
+2024-10-01, climate_geo_agged, all, 0
 2024-10-01, climate_quantile_extrapolated, all, 0
 ##################
+# April 30th
+##################
+2025-04-30, all, mp, 0
+2025-04-30, windowed_seasonal, all, 0.0001
+2025-04-30, windowed_seasonal_extra_sources, all, 3
+2025-04-30, climate_linear, all, 0.0001
+2025-04-30, linear, all, 3
+2025-04-30, linearlog, all, 0
+2025-04-30, climate_base, all, 2
+2025-04-30, climate_geo_agged, all, 0,
+2025-04-30, climate_quantile_extrapolated, all, 0
+##################
 # April 23rd
 ##################
 2025-04-23, all, mp, 0
diff --git a/flu_geo_exclusions.csv b/flu_geo_exclusions.csv
@@ -9,9 +9,21 @@ forecast_date,forecaster,geo_value,weight
 2024-10-01, linear, all, 2
 2024-10-01, linearlog, all, 0
 2024-10-01, climate_base, all, 0.5
-2024-10-01, climate_geo_agged, all, 0.25
+2024-10-01, climate_geo_agged, all, 0
 2024-10-01, climate_quantile_extrapolated, all, 0
 ##################
+# April 30th
+##################
+2025-04-30, all, mp, 0
+2025-04-30, windowed_seasonal, all, 3
+2025-04-30, windowed_seasonal_extra_sources, all, 3
+2025-04-30, climate_linear, all, 3
+2025-04-30, linear, all, 2
+2025-04-30, linearlog, all, 0
+2025-04-30, climate_base, all, 0.5
+2025-04-30, climate_geo_agged, all, 0
+2025-04-30, climate_quantile_extrapolated, all, 0
+##################
 # April 23rd
 ##################
 2025-04-23, all, mp, 0
diff --git a/scripts/covid_hosp_prod.R b/scripts/covid_hosp_prod.R
@@ -404,7 +404,7 @@ ensemble_targets <- tar_map(
           ),
           params = list(
             disease = "covid",
-            forecast_res = forecasts_and_ensembles,
+            forecast_res = forecasts_and_ensembles %>% ungroup() %>% filter(forecaster != "climate_geo_agged"),
             forecast_date = as.Date(forecast_date_int),
             truth_data = truth_data
           )
diff --git a/scripts/flu_hosp_prod.R b/scripts/flu_hosp_prod.R
@@ -445,7 +445,7 @@ ensemble_targets <- tar_map(
           ),
           params = list(
             disease = "flu",
-            forecast_res = forecasts_and_ensembles,
+            forecast_res = forecasts_and_ensembles%>% ungroup() %>% filter(forecaster != "climate_geo_agged"),
             forecast_date = as.Date(forecast_date_int),
             truth_data = truth_data
           )

Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,7 @@ ensemble_targets <- tar_map(`
`404`	`404`	`),`
`405`	`405`	`params = list(`
`406`	`406`	`disease = "covid",`
`407`		`- forecast_res = forecasts_and_ensembles,`
	`407`	`+ forecast_res = forecasts_and_ensembles %>% ungroup() %>% filter(forecaster != "climate_geo_agged"),`
`408`	`408`	`forecast_date = as.Date(forecast_date_int),`
`409`	`409`	`truth_data = truth_data`
`410`	`410`	`)`
Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,7 @@ ensemble_targets <- tar_map(`
`445`	`445`	`),`
`446`	`446`	`params = list(`
`447`	`447`	`disease = "flu",`
`448`		`- forecast_res = forecasts_and_ensembles,`
	`448`	`+ forecast_res = forecasts_and_ensembles%>% ungroup() %>% filter(forecaster != "climate_geo_agged"),`
`449`	`449`	`forecast_date = as.Date(forecast_date_int),`
`450`	`450`	`truth_data = truth_data`
`451`	`451`	`)`