Paddy/covid-19-analysis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

🐛 FIXED: Some graphs would be wrong for newer start dates

Browse Source 
- Because turns out that I'm just not that smart
This commit is contained in:
Patrick Müller 2020-04-04 17:10:22 +02:00
parent 374c44af3d
commit ac68c2389b
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Analyser.py
View File

@ -64,10 +64,11 @@ class Analyser:
plt.title(('Total cases in ' + country)) plt.title(('Total cases in ' + country))
countryData = self.df[self.df['countriesAndTerritories'].isin([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) mask = (countryData['dateRep'] >= start_date) & (countryData['dateRep'] <= end_date)
countryTimeData = countryData.loc[mask] countryTimeData = countryData.loc[mask]
countryTimeData = countryTimeData.sort_values('dateRep')
countryTimeData['totalCases'] = countryTimeData['cases'].cumsum()
countryTimeData.plot(ax=ax, x='dateRep', y='totalCases') countryTimeData.plot(ax=ax, x='dateRep', y='totalCases')
@ -144,10 +145,11 @@ class Analyser:
plt.title(('Total deaths in ' + country)) plt.title(('Total deaths in ' + country))
countryData = self.df[self.df['countriesAndTerritories'].isin([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) mask = (countryData['dateRep'] >= start_date) & (countryData['dateRep'] <= end_date)
countryTimeData = countryData.loc[mask] countryTimeData = countryData.loc[mask]
countryTimeData = countryTimeData.sort_values('dateRep')
countryTimeData['totalDeaths'] = countryTimeData['deaths'].cumsum()
countryTimeData.plot(ax=ax, x='dateRep', y='totalDeaths') countryTimeData.plot(ax=ax, x='dateRep', y='totalDeaths')
@ -224,12 +226,13 @@ class Analyser:
plt.title(('Daily death rate in ' + country) + ' in %') plt.title(('Daily death rate in ' + country) + ' in %')
countryData = self.df[self.df['countriesAndTerritories'].isin([country])] 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) mask = (countryData['dateRep'] >= start_date) & (countryData['dateRep'] <= end_date)
countryTimeData = countryData.loc[mask] 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') countryTimeData.plot(ax=ax, x='dateRep', y='deathRate')