Skip to content

Commit b73ebaf

Browse files
committed
update make, include exclusions csv
1 parent 675bb44 commit b73ebaf

File tree

2 files changed

+30
-3
lines changed

2 files changed

+30
-3
lines changed

Makefile

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,22 @@ test:
1111
run:
1212
Rscript scripts/run.R
1313

14+
prod-covid-logged:
15+
export TAR_RUN_PROJECT=covid_hosp_prod; Rscript scripts/run.R >> cache/logs/prod_covid 2>&1
16+
1417
prod-covid:
1518
export TAR_RUN_PROJECT=covid_hosp_prod; Rscript scripts/run.R
1619

20+
prod-flu-logged:
21+
export TAR_RUN_PROJECT=flu_hosp_prod; Rscript scripts/run.R >> cache/logs/prod_flu 2>&1
22+
1723
prod-flu:
1824
export TAR_RUN_PROJECT=flu_hosp_prod; Rscript scripts/run.R
1925

2026
prod: prod-covid prod-flu update-site netlify
2127

28+
prod-log: prod-covid-log prod-flu-log update-site-log netlify-log
29+
2230
prod-covid-backtest:
2331
export BACKTEST_MODE=TRUE; export TAR_RUN_PROJECT=covid_hosp_prod; Rscript scripts/run.R
2432

@@ -134,10 +142,16 @@ sync-reports:
134142
aws s3 sync s3://forecasting-team-data/2024/reports/ reports/
135143

136144
update-site: sync-reports
137-
Rscript -e "suppressPackageStartupMessages(source(here::here('R', 'load_all.R'))); update_site()" > cache/update_site_log.txt
145+
Rscript -e "suppressPackageStartupMessages(source(here::here('R', 'load_all.R'))); update_site()"
146+
147+
update-site-log: sync-reports
148+
Rscript -e "suppressPackageStartupMessages(source(here::here('R', 'load_all.R'))); update_site()" >> cache/logs/update_site_log.txt 2>&1
149+
150+
netlify-logged:
151+
netlify deploy --dir=reports --prod >> cache/prod_netlify 2>&1
138152

139153
netlify:
140-
netlify deploy --dir=reports --prod
154+
netlify deploy --dir=reports --prod
141155

142156
get-flu-prod-errors:
143157
Rscript -e "suppressPackageStartupMessages(source(here::here('R', 'load_all.R'))); get_targets_errors(project = 'flu_hosp_prod')"
@@ -182,4 +196,4 @@ update-only-nssp-submission:
182196
cat model-output/CMU-TimeSeries/$$date-CMU-TimeSeries.csv | grep "wk inc covid prop ed visits" > temp3.csv; \
183197
cat temp1.csv temp2.csv temp3.csv > model-output/CMU-TimeSeries/$$date-CMU-TimeSeries.csv; \
184198
rm temp1.csv temp2.csv temp3.csv; \
185-
cd -
199+
cd -
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
forecast_date,forecaster,geo_value,weight
2+
##################
3+
# default values
4+
##################
5+
2024-10-01, all, mp, 0
6+
2024-10-01, windowed_seasonal, all, 3
7+
2024-10-01, windowed_seasonal_extra_sources, all, 0.001
8+
2024-10-01, climate_linear, all, 0.001
9+
2024-10-01, linear, all, 2
10+
2024-10-01, linearlog, all, 0
11+
2024-10-01, climate_base, all, 0.5
12+
2024-10-01, climate_geo_agged, all, 0
13+
2024-10-01, climate_quantile_extrapolated, all, 0

0 commit comments

Comments
 (0)