en_begin settings

CovidAlertVaccinationModel/abm_timeseries.jl

@@ -6,7 +6,7 @@ using CovidAlertVaccinationModel:vaccination_data,ymo_vac,ymo_attack_rate
 const samples = 25
 
 function solve_and_plot_parameters()
-    p =  CovidAlertVaccinationModel.get_parameters()
+    p =  CovidAlertVaccinationModel.get_app_parameters()
     display(p)
     out,avg_populations = mean_solve(samples, p, record_degrees = true)
     p = plot_model(nothing,[nothing],[out],p)
@@ -27,8 +27,8 @@ function solve_and_plot_parameters()
     total_final_size = sum.(eachrow(mean.(out.daily_cases_by_age))) 
     println("vac + unvac cases proportion: $(total_final_size./avg_populations))")
 
-    mean_deg = mean.(out.avg_weighted_degree)
-    mean_vac_deg = mean.(out.avg_weighted_degree_of_vaccinators)
+    mean_deg = mean.(out.avg_weighted_degree_of_vaccinators)
+    mean_vac_deg = mean.(out.avg_weighted_degree_of_vaccinators_no_EN)
     println("mean weighted degree difference: $(mean_deg), $(mean_vac_deg)")
     display(sum.(eachrow(ymo_vaccination_ts)) ./avg_populations)