X-Git-Url: https://plomlompom.com/repos/do_day?a=blobdiff_plain;f=enhance_table.py;h=5287c03a3ea30796251eb1fda25455daa25b8632;hb=f0145a1f179e5fd3e61ab123fcc8ad967586fa90;hp=7da699dfdee9cc1feab083c05113942085aa1d08;hpb=707cfa7c1b642936ba94feb1be2d7a071bc0cdcf;p=berlin-corona-table
diff --git a/enhance_table.py b/enhance_table.py
index 7da699d..5287c03 100755
--- a/enhance_table.py
+++ b/enhance_table.py
@@ -94,6 +94,10 @@ for line in lines[1:]:
db[district][date] = {'new_infections': int(district_data)}
sorted_dates.sort()
+# Define and move sum_district from end to start.
+sum_district = sorted_districts.pop()
+sorted_districts.insert(0, sum_district)
+
# In LaGeSo's data, the last "district" is actually the sum of all districts /
# the whole of Berlin.
#
@@ -103,9 +107,8 @@ sorted_dates.sort()
# the table file, since we should have a human look at what mistake was
# probably made.
for date in sorted_dates:
- sum_district = sorted_districts[-1]
day_sum = 0
- for district in sorted_districts[:-1]:
+ for district in [d for d in sorted_districts if not d==sum_district]:
day_sum += db[district][date]['new_infections']
if day_sum != db[sum_district][date]['new_infections']:
raise Exception('Questionable district infection sum in %s' % date)
@@ -150,7 +153,6 @@ th { text-align: left; vertical-align: bottom; }
| """)
sorted_dates.reverse()
- sum_district = sorted_districts[-1]
for district in sorted_districts:
long_form = translate[district]
# Wrap in div because the vertical orientation otherwise fails
@@ -217,13 +219,12 @@ HTML view: https://plomlompom.com/berlin_corona.html
# separated into 7-day units.
sorted_dates.reverse()
weekday_count = 0
- sum_district = sorted_districts[-1]
for date in sorted_dates:
# Week table header.
if weekday_count == 0:
- print(' '*11, ' '.join(sorted_districts[:-1]),
- sorted_districts[-1], 'wsum', ' wavg', 'winc')
+ print(' '*10, ' '.join(sorted_districts),
+ 'wsum', ' wavg', 'winc')
week_start_date = date
# Day data line.
@@ -252,13 +253,13 @@ HTML view: https://plomlompom.com/berlin_corona.html
weekly_sums = []
weekly_avgs = []
weekly_incs = []
- for district in sorted_districts[:-1]:
+ for district in sorted_districts[1:]:
weekly_sums += [db[district][week_start_date]['week_sum']]
weekly_avgs += [db[district][week_start_date]['week_average']]
weekly_incs += [db[district][week_start_date]['week_incidence']]
print()
print('district stats for week from %s to %s:' % (date, week_start_date))
- print(' '*7, ' '.join(sorted_districts[:-1]))
+ print(' '*7, ' '.join(sorted_districts[1:]))
print('wsum', ' '.join(['%5.1f' % wsum for wsum in weekly_sums]))
print('wavg', ' '.join(['%5.1f' % wavg for wavg in weekly_avgs]))
print('winc', ' '.join(['%5.1f' % winc for winc in weekly_incs]))