Skip to content

Commit

Permalink
Merge branch 'european-modelling-hubs:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
sfiandrino authored Mar 4, 2024
2 parents a52b243 + 920e552 commit d9c74ac
Show file tree
Hide file tree
Showing 24 changed files with 30,364 additions and 716 deletions.
16 changes: 1 addition & 15 deletions .github/data-storage/changes_db.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,9 @@
{
"ECDC": [
{
"model": "soca_simplex",
"changes": [
"model-output/ECDC-soca_simplex/2024-02-28-ECDC-soca_simplex.csv"
]
},
{
"model": "ARI2MA",
"changes": [
"model-output/ECDC-ARI2MA/2024-02-28-ECDC-ARI2MA.csv"
]
}
],
"ISI": [
{
"model": "GenLogModelAri",
"changes": [
"model-output/ISI-GenLogModelAri/2024-02-28-ISI-GenLogModelAri.csv"
"model-output/ECDC-ARI2MA/2024-03-06-ECDC-ARI2MA.csv"
]
}
]
Expand Down
4 changes: 2 additions & 2 deletions .github/data-storage/target_db.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"ARI incidence": {
"changes": [
"target-data/ERVISS/snapshots/2024-02-23-ARI_incidence.csv",
"target-data/FluID/snapshots/2024-02-23-ARI_incidence.csv"
"target-data/ERVISS/snapshots/2024-03-01-ARI_incidence.csv",
"target-data/FluID/snapshots/2024-03-01-ARI_incidence.csv"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"target":["ARI incidence"],"countries":[{"id":["BG"],"members":[{"horizon":[1],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[2],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[3],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[4],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]}]},{"id":["CZ"],"members":[{"horizon":[1],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[2],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[3],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[4],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]}]},{"id":["DE"],"members":[{"horizon":[1],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[2],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[3],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[4],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]}]},{"id":["EE"],"members":[{"horizon":[1],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[2],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[3],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[4],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]}]},{"id":["ES"],"members":[{"horizon":[1],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[2],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[3],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[4],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]}]},{"id":["FR"],"members":[{"horizon":[1],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri"]},{"horizon":[2],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri"]},{"horizon":[3],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri"]},{"horizon":[4],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri"]}]},{"id":["GB-ENG"],"members":[{"horizon":[1],"models":["ECDC-ARI2MA"]},{"horizon":[2],"models":["ECDC-ARI2MA"]},{"horizon":[3],"models":["ECDC-ARI2MA"]},{"horizon":[4],"models":["ECDC-ARI2MA"]}]},{"id":["GB-NIR"],"members":[{"horizon":[1],"models":["ECDC-ARI2MA"]},{"horizon":[2],"models":["ECDC-ARI2MA"]},{"horizon":[3],"models":["ECDC-ARI2MA"]},{"horizon":[4],"models":["ECDC-ARI2MA"]}]},{"id":["GB-SCT"],"members":[{"horizon":[1],"models":["ECDC-ARI2MA"]},{"horizon":[2],"models":["ECDC-ARI2MA"]},{"horizon":[3],"models":["ECDC-ARI2MA"]},{"horizon":[4],"models":["ECDC-ARI2MA"]}]},{"id":["HU"],"members":[{"horizon":[1],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri"]},{"horizon":[2],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri"]},{"horizon":[3],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri"]},{"horizon":[4],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri"]}]},{"id":["LT"],"members":[{"horizon":[1],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[2],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[3],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[4],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]}]},{"id":["LV"],"members":[{"horizon":[1],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri"]},{"horizon":[2],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri"]},{"horizon":[3],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri"]},{"horizon":[4],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri"]}]},{"id":["RO"],"members":[{"horizon":[1],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[2],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[3],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[4],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]}]},{"id":["SI"],"members":[{"horizon":[1],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[2],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[3],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[4],"models":["ECDC-ARI2MA","ECDC-norrsken_blue","ECDC-norrsken_green","ECDC-soca_simplex","ISI-AriABCaster","ISI-EpiNowARI","ISI-GenLogModelAri","fjordhest-ensemble"]}]},{"id":["BE"],"members":[{"horizon":[1],"models":["ECDC-norrsken_blue","ECDC-norrsken_green","ISI-AriABCaster","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[2],"models":["ECDC-norrsken_blue","ECDC-norrsken_green","ISI-AriABCaster","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[3],"models":["ECDC-norrsken_blue","ECDC-norrsken_green","ISI-AriABCaster","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[4],"models":["ECDC-norrsken_blue","ECDC-norrsken_green","ISI-AriABCaster","ISI-GenLogModelAri","fjordhest-ensemble"]}]},{"id":["FI"],"members":[{"horizon":[1],"models":["ECDC-norrsken_blue","ECDC-norrsken_green","ISI-AriABCaster","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[2],"models":["ECDC-norrsken_blue","ECDC-norrsken_green","ISI-AriABCaster","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[3],"models":["ECDC-norrsken_blue","ECDC-norrsken_green","ISI-AriABCaster","ISI-GenLogModelAri","fjordhest-ensemble"]},{"horizon":[4],"models":["ECDC-norrsken_blue","ECDC-norrsken_green","ISI-AriABCaster","ISI-GenLogModelAri","fjordhest-ensemble"]}]}]}]
7 changes: 6 additions & 1 deletion .github/workflows/upload_baseline_and_ensemble.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,15 @@ on:

jobs:
scheduled-submit:
if: ${{ github.event.workflow_run.conclusion == 'success' && github.repository_owner == 'european-modelling-hubs' }}
# if: ${{ github.event.workflow_run.conclusion == 'success' && github.repository_owner == 'european-modelling-hubs' }}
if: ${{ github.repository_owner == 'european-modelling-hubs' }}
runs-on: ubuntu-latest

steps:
# Introduce some delay to complete DB write
- name: Sleep for 90 seconds
run: sleep 90s
shell: bash

# Checkout the python tools repo
# used to authenticate and validate the PR
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upload_scoring.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:

jobs:
scheduled-submit:
if: ${{ github.event.workflow_run.conclusion == 'success' && github.repository_owner == 'european-modelling-hubs' }}
#if: ${{ github.event.workflow_run.conclusion == 'success' && github.repository_owner == 'european-modelling-hubs' }}
runs-on: ubuntu-latest

steps:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ The European ARI Forecasting Hub collates weekly forecasts on Acute Respiratory
During the winter season, participating teams submit weekly probabilistic forecasts from their models regarding ARI incidence for the upcoming four weeks. This data is communicated every week by the ECDC through the [ERVISS report](https://erviss.org/). Data is updated generally on Friday, and it reports ARI incidence related up to the previous week. Forecast submission opens right after updated data are uploaded to this repository and closes on the next Wednesday at 23:59 CET. In the event of changes in the timelines of data availability, the day of the week for forecast submissions may be adjusted accordingly. In such instances, participants will receive notifications at least one week in advance. Following the submission deadline, forecasts and the ensemble are published on the [Hub website](https://respicast.ecdc.europa.eu/forecasts/) every Thursday. They cover the preceding week (which lacks consolidated public data), the current week, and the two subsequent weeks.

## Quick Start
This is a brief outline for anyone considering contributing a forecast. For a detailed guide on how to structure and submit a forecast, please read the technical [Wiki](https://github.com/european-modelling-hubs/ari-forecast-hub/wiki).
This is a brief outline for anyone considering contributing a forecast. For a detailed guide on how to structure and submit a forecast, please read the technical [Wiki](https://github.com/european-modelling-hubs/ari-forecast-hub/wiki) or watch the following tutorial video on how to submit your first forecast:

[![IMAGE ALT TEXT HERE](https://github.com/european-modelling-hubs/hub-tools/blob/main/submission_tutorial_img.png)](https://www.youtube.com/watch?v=Gpyc2fr9PYw)

Expand Down
2 changes: 1 addition & 1 deletion hub-config/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
},
"horizon": {
"required": null,
"optional": [1, 2, 3, 4]
"optional": [-1, 0, 1, 2, 3, 4]
},
"location": {
"required": null,
Expand Down
Loading

0 comments on commit d9c74ac

Please sign in to comment.