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

Updating to newest stats

Browse Source
This commit is contained in:
Patrick Müller 2020-07-20 13:44:07 +02:00
parent 982e0ba1da
commit 9a55031e89
3 changed files with 30972 additions and 10541 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Analyser.py
View File

@ -21,7 +21,7 @@ deaths
countriesAndTerritories countriesAndTerritories
geoId geoId
countryterritoryCode countryterritoryCode
popData2018 popData2019
""" """
from datetime import datetime, timedelta from datetime import datetime, timedelta
@ -345,7 +345,7 @@ class Analyser:
mask = (timeData['dateRep'] == date) mask = (timeData['dateRep'] == date)
timeData = timeData.loc[mask] timeData = timeData.loc[mask]
timeData = timeData.sort_values('countriesAndTerritories') timeData = timeData.sort_values('countriesAndTerritories')
timeData['casesPerMillion'] = ((timeData['totalCases'] / timeData['popData2018']) * 1000000) timeData['casesPerMillion'] = ((timeData['totalCases'] / timeData['popData2019']) * 1000000)
largestData = timeData.nlargest(20, 'casesPerMillion') largestData = timeData.nlargest(20, 'casesPerMillion')
if country not in largestData['countriesAndTerritories'].unique(): if country not in largestData['countriesAndTerritories'].unique():
@ -379,7 +379,7 @@ class Analyser:
mask = (timeData['dateRep'] == date) mask = (timeData['dateRep'] == date)
timeData = timeData.loc[mask] timeData = timeData.loc[mask]
timeData = timeData.sort_values('countriesAndTerritories') timeData = timeData.sort_values('countriesAndTerritories')
timeData['deathsPerMillion'] = ((timeData['totalDeaths'] / timeData['popData2018']) * 1000000) timeData['deathsPerMillion'] = ((timeData['totalDeaths'] / timeData['popData2019']) * 1000000)
largestData = timeData.nlargest(20, 'deathsPerMillion') largestData = timeData.nlargest(20, 'deathsPerMillion')
if country not in largestData['countriesAndTerritories'].unique(): if country not in largestData['countriesAndTerritories'].unique():

1
UserInterface.py
View File

@ -30,6 +30,7 @@ class UserInterface(QWidget):
# Plot DPI Settings # Plot DPI Settings
self.plotDpi = screen_width / 20 self.plotDpi = screen_width / 20
print(screen_height)
# Layout boxes # Layout boxes
self.header_box = QHBoxLayout() self.header_box = QHBoxLayout()

41506
statsfile.csv
View File

File diff suppressed because it is too large Load Diff