diff --git a/SRI_matlab/main.m b/SRI_matlab/main.m index f520f4c373f12849665ae0f21c9c51542597a43a..fb9df2e2988780b5e14ee61519d76975008cda3d 100644 --- a/SRI_matlab/main.m +++ b/SRI_matlab/main.m @@ -14,11 +14,11 @@ coeffs.ImmunisationLossRate = 2.7e-4; coeffs.DeathRate = 1.3e-2; coeffs.NaturalDeathRate = 2e-4; coeffs.NatalityRate = 5.3e-4; -coeffs.QuarantineRate = 0.01; +coeffs.QuarantineRate = 0; VaccinationVector = build_vacc_rate(0, 0, 0, N); % VaccinationVector = build_vacc_rate(0, 0, 50, N); -m = model(S, I, Q, R, 12, N); +m = model(S, I, Q, R, 1, N); t = 1:N; diff --git a/SRI_matlab/step.m b/SRI_matlab/step.m index 2353e56c81db450dcddd70cf04d69207fe323842..c874baf51a46aa0b4b42337e4b2b3f37007d45b4 100644 --- a/SRI_matlab/step.m +++ b/SRI_matlab/step.m @@ -12,9 +12,9 @@ for i=6:length(X) end if length(X) > 4 - % infection = S * (1 - 25 * options.InfectionRate / N) ^ I; - infecter = sum(X(5:length(X)) + I); - infection = options.InfectionRate * S * infecter/N; + infection = S * (1 - 25 * options.InfectionRate / N) ^ I; + % infecter = sum(X(5:length(X)) + I); + % infection = options.InfectionRate * S * infecter/N; new_waiting(1) = infection; dS = -infection; dI = X(length(X));