From f1adfdc008a1ea9951184dc74181460ec40cb13c Mon Sep 17 00:00:00 2001
From: pjentsch <pjentsch@uwaterloo.ca>
Date: Tue, 11 May 2021 13:20:07 -0400
Subject: [PATCH] make overall population sum weighted by statcan weights..
need to rerun intervalsmodel
---
CovidAlertVaccinationModel/src/data.jl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CovidAlertVaccinationModel/src/data.jl b/CovidAlertVaccinationModel/src/data.jl
index 9da3054..55332ad 100644
--- a/CovidAlertVaccinationModel/src/data.jl
+++ b/CovidAlertVaccinationModel/src/data.jl
@@ -44,11 +44,11 @@ function read_household_data()
end
function sample_household_data(n)
- return sample(Random.default_rng(Threads.threadid()),household_data.households, Weights(household_data.weight_vector),n)
+ return sample(local_rng(),household_data.households, Weights(household_data.weight_vector),n)
end
function get_household_data_proportions()
- households_by_demographic_sum = sum.([map(l-> l[i],household_data.households) for i in 1:3])
+ households_by_demographic_sum = sum.([map(((l,w),)-> l[i]*w,zip(household_data.households,household_data.weight_vector)) for i in 1:3])
return households_by_demographic_sum./sum(households_by_demographic_sum)
# https://www.publichealthontario.ca/-/media/documents/ncov/epi/covid-19-severe-outcomes-ontario-epi-summary.pdf?la=en
end
--
GitLab