Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: seroprevalence #777

Merged
merged 49 commits into from
Aug 29, 2020
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
1d65606
feat: add seroprevalence to UI and schema
ivan-aksamentov Jul 31, 2020
7724069
feat: commit types and validators for schema v2.1.0
ivan-aksamentov Jul 31, 2020
ad7c32b
feat: add seroprevalence to serialization
ivan-aksamentov Jul 31, 2020
464cd93
feat: add seroprevalence in scenario data generator
ivan-aksamentov Jul 31, 2020
12810db
feat: add serializer 2.2.0 to the list of serializers
ivan-aksamentov Jul 31, 2020
30c2c94
feat: account for seroprevalence in the algorithm
ivan-aksamentov Jul 31, 2020
a68311e
refactor: clarify the logic for susceptible population
ivan-aksamentov Jul 31, 2020
aa713cc
feat: account for seroprevalence in recovered
ivan-aksamentov Jul 31, 2020
2f96ce8
refactor: clarify the logic for susceptible population more
ivan-aksamentov Jul 31, 2020
130f335
fix: add seroprevalence in test data
ivan-aksamentov Jul 31, 2020
231d832
fix: fix model tests
ivan-aksamentov Jul 31, 2020
bace8be
fix: fi incorrect seroprevalence fraction
ivan-aksamentov Jul 31, 2020
fd0f9d9
add immune vector to result -- allow it to be age specific
rneher Aug 1, 2020
8ac2dad
fix: fix print preview page
ivan-aksamentov Aug 3, 2020
d0ed28a
chore: trigger ci build
ivan-aksamentov Aug 3, 2020
1f3d1d7
chore: remove unused fies
ivan-aksamentov Aug 3, 2020
cdbb010
[chore] change python indent
rneher Aug 4, 2020
95e7af7
rewrite fitting procedure
rneher Aug 4, 2020
51d580a
add initial r0 to populationData
rneher Aug 4, 2020
ea8d917
add first go at fit_parameters
rneher Aug 4, 2020
5a3da6a
added preliminary scenario data
rneher Aug 4, 2020
65e65e1
Merge branch 'master' into feat/seroprevalence
rneher Aug 15, 2020
bb2d106
update severity distribution, tweak fitting procedure
rneher Aug 15, 2020
9803f45
fix calculation of implied fatality ratio in severity table
rneher Aug 15, 2020
4bade4b
evaluate Rt for the entire duration and include seroprevalence
rneher Aug 16, 2020
0c64400
remove print statements
rneher Aug 17, 2020
8b87b7d
update fit paramters
rneher Aug 17, 2020
33370a9
remove duplicate import
rneher Aug 17, 2020
4188515
add scenarios json
rneher Aug 17, 2020
562dcd2
fix: add missing object properties
ivan-aksamentov Aug 18, 2020
eecd11e
Merge remote-tracking branch 'origin/master' into feat/seroprevalence
ivan-aksamentov Aug 18, 2020
6501a0e
Merge branch 'master' into feat/seroprevalence
rneher Aug 22, 2020
9bb491d
add burnin feature to start simulation with sensible mix of exposed, …
rneher Aug 22, 2020
d23efa7
add prelim message to updates page
rneher Aug 22, 2020
45b6d18
catch masked seroprevalence
rneher Aug 22, 2020
68dede5
update fit parameters
rneher Aug 22, 2020
6a1fe95
update scenarios
rneher Aug 22, 2020
42b741e
update seroprevalence help text
rneher Aug 22, 2020
51dbe9c
include 1st wave scenarios
rneher Aug 22, 2020
8274ed1
update help messages and about
rneher Aug 22, 2020
f65c37c
set yAxis limit for age chart
rneher Aug 22, 2020
5803e84
Merge branch 'master' into feat/seroprevalence
rneher Aug 25, 2020
5ac47fc
extend time horizon
rneher Aug 25, 2020
038c66c
update tsvs
rneher Aug 29, 2020
118a70e
update case count json
rneher Aug 29, 2020
2a7e864
update fitting
rneher Aug 29, 2020
9fc9ec5
update scenarios
rneher Aug 29, 2020
a4bb32e
add note to disclaimer
rneher Aug 29, 2020
e51099c
version bump
rneher Aug 29, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
\.build
\.cache
\.env
\.generated
\.idea
\.output
\.reports
Expand Down
3 changes: 3 additions & 0 deletions data/scripts/default_schema_values.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
# Globals

DEFAULTS = {
"PopulationData" : {
"seroprevalence": 0.0,
},
"EpidemiologicalData" : {
"latencyTime" : 3.0,
"infectiousPeriod" : 3.0,
Expand Down
2 changes: 2 additions & 0 deletions data/scripts/scenarios.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,15 @@ def __init__(self, name='Intervention', tMin=None, tMax=None, id='', color='#ccc

class PopulationParams(schema.ScenarioDatumPopulation):
def __init__(self, region, age_distribution_name, population, beds, icus, cases_key):
defaults = DEFAULTS["PopulationData"]
super(PopulationParams, self).__init__( \
case_counts_name=cases_key,
age_distribution_name=age_distribution_name,
hospital_beds=int(beds),
icu_beds=int(icus),
imports_per_day=0.1,
population_served=int(population),
seroprevalence=defaults['seroprevalence'],
initial_number_of_cases=int(round(FIT_CASE_DATA[region]['initialCases']
if region in FIT_CASE_DATA else Fitter.cases_on_tMin)))

Expand Down
Loading