X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;ds=sidebyside;f=enhance_table.py;h=3d3ec779d0a6d77ebcae2d6ea0d90ef3bda493b4;hb=4cd546a67ccdb4d490d8bc3a5c09dd00ced77224;hp=a626329bcd20236477e60b8bd80b93c38274bcaa;hpb=078d5207c9a6d7ad4611df311a5e11a635f6f30f;p=berlin-corona-table diff --git a/enhance_table.py b/enhance_table.py index a626329..3d3ec77 100755 --- a/enhance_table.py +++ b/enhance_table.py @@ -60,9 +60,9 @@ for i in range(len(sorted_dates)): if i < 6: continue date = sorted_dates[i] - week_dates = [] + week_dates = [] for j in range(7): - week_dates += [sorted_dates[i - j]] + week_dates += [sorted_dates[i - j]] for district in sorted_districts: district_pop = district_pops[district] week_sum = 0 @@ -73,11 +73,11 @@ for i in range(len(sorted_dates)): 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, daily -updated around 9pm. +intro = """Table of Berlin's Corona infection number development by districts. +Updated daily around 9pm. Abbrevations/explanations: + CW: Charlottenburg-Wilmersdorf FK: Friedrichshain-Kreuzberg Li: Lichtenberg @@ -109,9 +109,9 @@ for date in sorted_dates: if weekday_count == 0: print(' '*11, ' '.join(sorted_districts[:-1]), sorted_districts[-1], 'wsum', ' wavg', 'winc') - week_start_date = date + week_start_date = date - # Day data line. + # Day data line. new_infections = [] for district in sorted_districts: new_infections += [db[district][date]['new_infections']] @@ -119,13 +119,13 @@ for date in sorted_dates: 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'] + week_sum = '%4s' % sum_district_data['week_sum'] if 'week_average' in sum_district_data: - week_avg = '%5.1f' % sum_district_data['week_average'] + 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'] + 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) + week_sum, week_avg, week_inc) # Maintain 7-day cycle. weekday_count += 1