From ac68c2389b56ab7f6526a27f61ce7de6b38972ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20M=C3=BCller?= Date: Sat, 4 Apr 2020 17:10:22 +0200 Subject: [PATCH] :bug: FIXED: Some graphs would be wrong for newer start dates - Because turns out that I'm just not that smart --- Analyser.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Analyser.py b/Analyser.py index 05c156b..38a0914 100644 --- a/Analyser.py +++ b/Analyser.py @@ -64,10 +64,11 @@ class Analyser: plt.title(('Total cases in ' + country)) countryData = self.df[self.df['countriesAndTerritories'].isin([country])] + countryData = countryData.sort_values('dateRep') + countryData['totalCases'] = countryData['cases'].cumsum() mask = (countryData['dateRep'] >= start_date) & (countryData['dateRep'] <= end_date) countryTimeData = countryData.loc[mask] - countryTimeData = countryTimeData.sort_values('dateRep') - countryTimeData['totalCases'] = countryTimeData['cases'].cumsum() + countryTimeData.plot(ax=ax, x='dateRep', y='totalCases') @@ -144,10 +145,11 @@ class Analyser: plt.title(('Total deaths in ' + country)) countryData = self.df[self.df['countriesAndTerritories'].isin([country])] + countryData = countryData.sort_values('dateRep') + countryData['totalDeaths'] = countryData['deaths'].cumsum() mask = (countryData['dateRep'] >= start_date) & (countryData['dateRep'] <= end_date) countryTimeData = countryData.loc[mask] - countryTimeData = countryTimeData.sort_values('dateRep') - countryTimeData['totalDeaths'] = countryTimeData['deaths'].cumsum() + countryTimeData.plot(ax=ax, x='dateRep', y='totalDeaths') @@ -224,12 +226,13 @@ class Analyser: plt.title(('Daily death rate in ' + country) + ' in %') countryData = self.df[self.df['countriesAndTerritories'].isin([country])] + countryData = countryData.sort_values('dateRep') + countryData['totalCases'] = countryData['cases'].cumsum() + countryData['totalDeaths'] = countryData['deaths'].cumsum() + countryData['deathRate'] = countryData['totalDeaths'] / countryData['totalCases'] * 100 mask = (countryData['dateRep'] >= start_date) & (countryData['dateRep'] <= end_date) countryTimeData = countryData.loc[mask] - countryTimeData = countryTimeData.sort_values('dateRep') - countryTimeData['totalCases'] = countryTimeData['cases'].cumsum() - countryTimeData['totalDeaths'] = countryTimeData['deaths'].cumsum() - countryTimeData['deathRate'] = countryTimeData['totalDeaths'] / countryTimeData['totalCases'] * 100 + countryTimeData.plot(ax=ax, x='dateRep', y='deathRate')