diff --git a/CovidAlertVaccinationModel/src/ABM/solve.jl b/CovidAlertVaccinationModel/src/ABM/solve.jl index a29784c15c085c29f2b6a0437c07da0ee30795a2..e748f0d261aeced4b8f4e69076e037d3c65bbbc0 100644 --- a/CovidAlertVaccinationModel/src/ABM/solve.jl +++ b/CovidAlertVaccinationModel/src/ABM/solve.jl @@ -144,7 +144,6 @@ function agents_step!(t,modelsol,vaccinate_today) u_next_inf .= u_inf u_next_vac .= u_vac modelsol.output_data.recorded_status_totals[:,t+1] .= modelsol.output_data.recorded_status_totals[:,t] - total_infected = modelsol.output_data.recorded_status_totals[Int(Infected), t] β_vec = @SVector [β_y,β_m,β_o] α_vec = @SVector [α_y,α_m,α_o] @@ -154,7 +153,6 @@ function agents_step!(t,modelsol,vaccinate_today) π_base_vec = @SVector [π_base_y*ζ,π_base_m*ζ,π_base_o*ζ] end - for (agent,(agent_inf_status,agent_is_vaccinator,agent_demo)) in enumerate(zip(u_inf,u_vac,demographics)) if agent_inf_status == Susceptible @@ -180,9 +178,13 @@ function agents_step!(t,modelsol,vaccinate_today) if immunization_countdown[agent] == 0 output_data.daily_immunized_by_age[Int(agent_demo),t] += 1 fit!(output_data.avg_weighted_degree_of_vaccinators[Int(agent_demo)],weighted_degree_of_i) + agent_transition!(t,modelsol, agent, Susceptible,Immunized) elseif immunization_countdown[agent]>0 immunization_countdown[agent] -= 1 + else + fit!(output_data.avg_weighted_degree[Int(agent_demo)],weighted_degree_of_i) end + total_infected = modelsol.output_data.recorded_status_totals[Int(Infected), t] update_vaccination_opinion_state!(t, agent, modelsol,vaccinate_today, total_infected,π_base_vec) end diff --git a/timeseries.pdf b/timeseries.pdf index c6327733a2b03a5e03bcc603bd1da2af70b146ae..90a3914edabcfd792882f3ec560a4003bbbfe135 100644 Binary files a/timeseries.pdf and b/timeseries.pdf differ