From d7ded70f1b758df9b7290b505418b5b155fec66c Mon Sep 17 00:00:00 2001 From: Benedikt Bastin Date: Mon, 12 Apr 2021 13:38:30 +0200 Subject: [PATCH] fix: Calculation of remaining days for vaccination goals was wrong --- plot.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/plot.py b/plot.py index 60db894..d298fde 100644 --- a/plot.py +++ b/plot.py @@ -105,10 +105,10 @@ def calculate_vaccination_data(data): def extrapolate(rate, to_be_vaccinated): days_extrapolated = int(np.ceil(to_be_vaccinated / rate)) - extrapolated_dates = np.array([dates[0] + datetime.timedelta(days=i) for i in range(days_extrapolated)]) + days_extrapolated_herd_immunity = int(np.ceil((einwohner_deutschland * 0.7 - total) / rate)) - date_done = extrapolated_dates[-1] - date_herd_immunity = extrapolated_dates[int(np.ceil(days_extrapolated * herd_immunity))] + date_done = today + datetime.timedelta(days_extrapolated) + date_herd_immunity = today + datetime.timedelta(days_extrapolated_herd_immunity) extrapolated_vaccinations = total + rate * range(-days_since_start_of_reporting, days_extrapolated - days_since_start_of_reporting) @@ -116,7 +116,6 @@ def calculate_vaccination_data(data): 'rate': rate, 'rate_int': int(np.round(rate)), 'days_extrapolated': days_extrapolated, - 'dates': extrapolated_dates, 'date_done': date_done, 'date_done_str': date_done.strftime('%d. %B %Y'), 'date_herd_immunity': date_herd_immunity,