Fix broken txt version.

[berlin-corona-table] / enhance_table.py

diff --git a/enhance_table.py b/enhance_table.py
index cfb5eff9dba7e1fde9cb7709d2f00cc9f4c3cc51..3e36e0e40d0dc51913ef55d0f5d4ef8fe1434c9f 100755 (executable)
--- a/enhance_table.py
+++ b/enhance_table.py
@@ -32,7 +32,7 @@ translate = {
   'TS': 'Tempelhof-Schöneberg',
   'TK': 'Treptow-Köpenick',
   'sum': 'all of Berlin',
-  'wsum': 'sum for last 7 days',
+  'wsum': 'sum of new infections for last 7 days',
   'wavg': 'per-day average of new infections for last 7 days',
   'winc': 'incidence (x per 100k inhabitants) of new infections for last 7 days',
 }
@@ -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; }
 <tr>
 <th colspan=2></th>""")
     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
@@ -209,7 +211,6 @@ Abbrevations/explanations:
         intro += "%s: %s\n" % (k, translate[k])
     intro += """
 Source code: https://plomlompom.com/repos/?p=berlin-corona-table
-
 HTML view: https://plomlompom.com/berlin_corona.html
 """
     print(intro)
@@ -218,7 +219,6 @@ 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.
@@ -253,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]))