Skip to content

Commit

Permalink
fix briefing summary numbers not matching
Browse files Browse the repository at this point in the history
  • Loading branch information
djay committed Nov 23, 2021
1 parent 63b89be commit a452d41
Show file tree
Hide file tree
Showing 2 changed files with 145 additions and 1 deletion.
2 changes: 1 addition & 1 deletion covid_data_briefing.py
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ def briefing_deaths_summary(text, date, file):
disease: get_next_number(text, *thdiseases, default=0, return_rest=False, until=r"\)", require_until=True)
for disease, thdiseases in diseases.items()
}
if date not in [d("2021-8-10"), d("2021-09-23")]:
if date not in [d("2021-8-10"), d("2021-09-23"), d("2021-11-22")]:
assert sum(comorbidity.values()) >= deaths_title, f"Missing comorbidity {comorbidity}\n{text}"

risks = {
Expand Down
144 changes: 144 additions & 0 deletions tests/briefing_deaths_summary/2021-11-22.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
{
"schema":{
"fields":[
{
"name":"Date",
"type":"datetime"
},
{
"name":"Deaths",
"type":"integer"
},
{
"name":"Deaths Age Median",
"type":"number"
},
{
"name":"Deaths Age Min",
"type":"number"
},
{
"name":"Deaths Age Max",
"type":"number"
},
{
"name":"Deaths Male",
"type":"integer"
},
{
"name":"Deaths Female",
"type":"integer"
},
{
"name":"Deaths Risk Family",
"type":"integer"
},
{
"name":"Deaths Risk Others",
"type":"integer"
},
{
"name":"Deaths Risk Residence",
"type":"integer"
},
{
"name":"Deaths Risk Location",
"type":"integer"
},
{
"name":"Deaths Risk Crowds",
"type":"integer"
},
{
"name":"Deaths Risk Work",
"type":"integer"
},
{
"name":"Deaths Risk HCW",
"type":"integer"
},
{
"name":"Deaths Risk Unknown",
"type":"integer"
},
{
"name":"Deaths Comorbidity Hypertension",
"type":"integer"
},
{
"name":"Deaths Comorbidity Diabetes",
"type":"integer"
},
{
"name":"Deaths Comorbidity Hyperlipidemia",
"type":"integer"
},
{
"name":"Deaths Comorbidity Lung disease",
"type":"integer"
},
{
"name":"Deaths Comorbidity Obesity",
"type":"integer"
},
{
"name":"Deaths Comorbidity Cerebrovascular",
"type":"integer"
},
{
"name":"Deaths Comorbidity Kidney disease",
"type":"integer"
},
{
"name":"Deaths Comorbidity Heart disease",
"type":"integer"
},
{
"name":"Deaths Comorbidity Bedridden",
"type":"integer"
},
{
"name":"Deaths Comorbidity Pregnant",
"type":"integer"
},
{
"name":"Deaths Comorbidity None",
"type":"integer"
}
],
"primaryKey":[
"Date"
],
"pandas_version":"0.20.0"
},
"data":[
{
"Date":"2021-11-22T00:00:00.000Z",
"Deaths":49,
"Deaths Age Median":68.0,
"Deaths Age Min":14.0,
"Deaths Age Max":95.0,
"Deaths Male":29,
"Deaths Female":20,
"Deaths Risk Family":3,
"Deaths Risk Others":23,
"Deaths Risk Residence":22,
"Deaths Risk Location":0,
"Deaths Risk Crowds":0,
"Deaths Risk Work":0,
"Deaths Risk HCW":0,
"Deaths Risk Unknown":0,
"Deaths Comorbidity Hypertension":18,
"Deaths Comorbidity Diabetes":12,
"Deaths Comorbidity Hyperlipidemia":6,
"Deaths Comorbidity Lung disease":0,
"Deaths Comorbidity Obesity":4,
"Deaths Comorbidity Cerebrovascular":0,
"Deaths Comorbidity Kidney disease":4,
"Deaths Comorbidity Heart disease":0,
"Deaths Comorbidity Bedridden":1,
"Deaths Comorbidity Pregnant":0,
"Deaths Comorbidity None":0
}
]
}

0 comments on commit a452d41

Please sign in to comment.