Commit 1f5ca796 authored by Chris Jewell's avatar Chris Jewell
Browse files

Last changes for 2020-12-07 analysis

CHANGE:

1. Reverse experimental selection of last but one xi.
2. Updated template for most recent flow data
parent bd11eeec
......@@ -63,7 +63,7 @@ def calc_R_it(param, events, init_state, covar_data, priors):
beta3=beta3_,
sigma=sigma_,
gamma0=gamma0_,
xi=xi_[:-1], # tf.reshape(xi_pred.sample(), [1]),
xi=xi_,
)
print("xi shape:", par["xi"].shape)
ngm_fn = model_spec.next_generation_matrix_fn(covar_data, par)
......@@ -107,7 +107,7 @@ def predicted_incidence(param, init_state, init_step, num_steps, priors):
beta3=beta3_,
gamma0=gamma0_,
gamma1=gamma1_,
xi=xi_[:-1],
xi=xi_,
)
model = model_spec.CovidUK(
......
......@@ -3,7 +3,7 @@
data:
mobility_matrix: data/mergedflows.csv
population_size: data/c2019modagepop.csv
commute_volume: data/201127_OFF_SEN_COVID19_road_traffic_national_table.xlsx
commute_volume: data/201204_OFF_SEN_COVID19_road_traffic_national_table.xlsx
reported_cases: data/Anonymised Combined Line List 20201109.csv
case_date_type: specimen
pillar: both
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment