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')