X-Git-Url: https://plomlompom.com/repos/do_day?a=blobdiff_plain;f=enhance_table.py;h=02a7ac9b30b8cd0375a79a49468e2dc5c19e3d77;hb=a3d2a6533cb6aee29c48c8e1e08e4981c0c8829b;hp=2b6bb8dc8ff7fcc4f51cb279a44671294f4a0d79;hpb=d90d54eb25c326364575d062543664a214506210;p=berlin-corona-table
diff --git a/enhance_table.py b/enhance_table.py
index 2b6bb8d..02a7ac9 100755
--- a/enhance_table.py
+++ b/enhance_table.py
@@ -1,11 +1,5 @@
#!//usr/bin/env python3
-import sys
-if len(sys.argv) != 2:
- print('Expecting infections table file path as only argument.')
- exit(1)
-infections_table = sys.argv[1]
-
# District population numbers as per Wikipedia.
district_pops = {
'CW': 342332,
@@ -23,10 +17,44 @@ district_pops = {
'sum': 3754418,
}
+# Read infections table path and output type.
+import sys
+if len(sys.argv) != 3:
+ print('Expecting infections table file path and output type as only arguments.')
+ exit(1)
+infections_table = sys.argv[1]
+output_type = sys.argv[2]
+
+# Read infections table file lines.
f = open(infections_table, 'r')
lines = f.readlines()
f.close()
+# Basic input validation.
+import datetime
+header_elements = lines[0].split()
+if set(header_elements) != district_pops.keys() or \
+ len(header_elements) != len(district_pops.keys()):
+ raise Exception('infections table: invalid header')
+line_count = 0
+for line in lines[1:]:
+ line_count += 1
+ fields = line.split()
+ if len(header_elements) != len(fields) - 1:
+ raise Exception('infections table: too many elements on line %s',
+ line_count)
+ try:
+ datetime.date.fromisoformat(fields[0])
+ except ValueError:
+ raise Exception('infections table: bad ISO date on line %s',
+ line_count)
+ for field in fields[1:]:
+ try:
+ int(field)
+ except ValueError:
+ raise Exception('infections table: bad value on line %s',
+ line_count)
+
# Parse first table file line for the names and order of districts.
db = {}
sorted_districts = []
@@ -81,8 +109,50 @@ for i in range(len(sorted_dates)):
db[district][date]['week_average'] = week_sum / 7
db[district][date]['week_incidence'] = (week_sum / district_pop) * 100000
-# Explain what this is.
-intro = """Table of Berlin's Corona infection number development by districts.
+# Optimized for web browser viewing.
+if output_type == 'html':
+ print('')
+ print('')
+ print('
')
+ print('')
+ print('date | ')
+ for district in sorted_districts:
+ print('%s | ' % district)
+ print('
')
+ sorted_dates.reverse()
+ for date in sorted_dates:
+ print('')
+ print('%s | ' % date)
+ for district in sorted_districts:
+ district_data = db[district][date]
+ week_sum = week_avg = week_inc = ''
+ new_infections = district_data['new_infections']
+ if 'week_sum' in district_data:
+ week_sum = '%s' % district_data['week_sum']
+ if 'week_average' in district_data:
+ week_avg = '%.1f' % district_data['week_average']
+ if 'week_incidence' in district_data:
+ week_inc = '%.1f' % district_data['week_incidence']
+ print('')
+ print('')
+ print('new | %s | ' % new_infections)
+ print('wsum | %s | ' % week_sum)
+ print('wavg | %s | ' % week_avg)
+ print('winc | %s | ' % week_inc)
+ print(' ')
+ print(' | ')
+ print('
')
+ print('
')
+ print('')
+
+# Optimized for in-terminal curl.
+elif output_type == 'txt':
+
+ # Explain what this is.
+ intro = \
+"""Table of Berlin's Corona infection number development by districts.
Updated daily around 9pm.
Abbrevations/explanations:
@@ -106,54 +176,55 @@ winc: incidence (x per 100k inhabitants) of new infections for last 7 days
Source code: https://plomlompom.com/repos/?p=berlin-corona-table
"""
-print(intro)
-
-# Output table of enhanced daily infection data, newest on top, separated into
-# 7-day units.
-sorted_dates.reverse()
-weekday_count = 0
-for date in sorted_dates:
+ print(intro)
- # Week table header.
- if weekday_count == 0:
- print(' '*11, ' '.join(sorted_districts[:-1]),
- sorted_districts[-1], 'wsum', ' wavg', 'winc')
- week_start_date = date
-
- # Day data line.
- new_infections = []
- for district in sorted_districts:
- new_infections += [db[district][date]['new_infections']]
- week_sum = week_avg = week_inc = ''
- sum_district = sorted_districts[-1]
- sum_district_data = db[sum_district][date]
- if 'week_sum' in sum_district_data:
- week_sum = '%4s' % sum_district_data['week_sum']
- if 'week_average' in sum_district_data:
- week_avg = '%5.1f' % sum_district_data['week_average']
- if 'week_incidence' in sum_district_data:
- week_inc = '%4.1f' % sum_district_data['week_incidence']
- print(date, ' '.join(['%3s' % infections for infections in new_infections]),
- week_sum, week_avg, week_inc)
-
- # Maintain 7-day cycle.
- weekday_count += 1
- if weekday_count != 7:
- continue
+ # Output table of enhanced daily infection data, newest on top,
+ # separated into 7-day units.
+ sorted_dates.reverse()
weekday_count = 0
-
- # After each 7 days, print summary for individual districts.
- weekly_sums = []
- weekly_avgs = []
- weekly_incs = []
- 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()
+ 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')
+ week_start_date = date
+
+ # Day data line.
+ new_infections = []
+ for district in sorted_districts:
+ new_infections += [db[district][date]['new_infections']]
+ week_sum = week_avg = week_inc = ''
+ sum_district_data = db[sum_district][date]
+ if 'week_sum' in sum_district_data:
+ week_sum = '%4s' % sum_district_data['week_sum']
+ if 'week_average' in sum_district_data:
+ week_avg = '%5.1f' % sum_district_data['week_average']
+ if 'week_incidence' in sum_district_data:
+ week_inc = '%4.1f' % sum_district_data['week_incidence']
+ print(date, ' '.join(['%3s' % infections
+ for infections in new_infections]),
+ week_sum, week_avg, week_inc)
+
+ # Maintain 7-day cycle.
+ weekday_count += 1
+ if weekday_count != 7:
+ continue
+ weekday_count = 0
+
+ # After each 7 days, print summary for individual districts.
+ weekly_sums = []
+ weekly_avgs = []
+ weekly_incs = []
+ 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()