X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=enhance_table.py;h=07ad84bfe20ef809b8a2aabb3c56b64efc0206b4;hb=15078e431bc826110aa93dd78af7b60f132671ab;hp=2410099c2e3c72a07acb450a1e441ec47b980c46;hpb=f13581e13f5e699a54dc3d7b48efffbd149e1966;p=berlin-corona-table

diff --git a/enhance_table.py b/enhance_table.py
index 2410099..07ad84b 100755
--- a/enhance_table.py
+++ b/enhance_table.py
@@ -32,9 +32,9 @@ translate = {
   'TS': 'Tempelhof-Schöneberg',
   'TK': 'Treptow-Köpenick',
   'sum': 'all of Berlin',
-  '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',
+  'Σ': 'sum of new infections for last 7 days',
+  'Ø': 'per-day average of new infections for last 7 days',
+  'i': 'incidence (x per 100k inhabitants) of new infections for last 7 days',
 }
 
 # Read infections table path and output type.
@@ -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)
@@ -167,8 +170,8 @@ th { text-align: left; vertical-align: bottom; }
         print('<tr class="day_row">')
         print('<td>%s</td>' % date)
         print('<td><table>')
-        print('<tr><th><abbr title="new infections counted">new</abbr></th></tr>')
-        for abbr in ['wsum', 'wavg', 'winc']:
+        print('<tr><th><abbr title="new infections counted">+</abbr></th></tr>')
+        for abbr in ['Σ', 'Ø', 'i']:
             print('<tr><th><abbr title="%s">%s</abbr></th></tr>' %
                   (translate[abbr], abbr))
         print('</table></td>')
@@ -220,8 +223,8 @@ HTML view: https://plomlompom.com/berlin_corona.html
 
         # Week table header.
         if weekday_count == 0:
-            print(' '*11, '  '.join(sorted_districts[:-1]),
-                  sorted_districts[-1], 'wsum', ' wavg', 'winc')
+            print(' '*10, '  '.join(sorted_districts),
+                  '   Σ', '    Ø', '   i')
             week_start_date = date
 
         # Day data line.
@@ -250,14 +253,14 @@ 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('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]))
+        print(' '*4, '    '.join(sorted_districts[1:]))
+        print('Σ', ' '.join(['%5.1f' % wsum for wsum in weekly_sums]))
+        print('Ø', ' '.join(['%5.1f' % wavg for wavg in weekly_avgs]))
+        print('i', ' '.join(['%5.1f' % winc for winc in weekly_incs]))
         print()