X-Git-Url: https://plomlompom.com/repos/?p=berlin-corona-table;a=blobdiff_plain;f=enhance_table.py;h=cee78f82bb674fb98a879c1814bc6a2cca078ea8;hp=c2ea18d658abfa5e764d7f1c59d38e2448e7609c;hb=56de61949ed35ecb8ab728dd1912e161892bc521;hpb=8a5c961404590f6ef2145d6e37906d41775361f0 diff --git a/enhance_table.py b/enhance_table.py index c2ea18d..cee78f8 100755 --- a/enhance_table.py +++ b/enhance_table.py @@ -32,9 +32,10 @@ translate = { 'TS': 'Tempelhof-Schöneberg', 'TK': 'Treptow-Köpenick', 'sum': 'all of Berlin', - 'wsum': 'sum 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', + '+': 'new infections counted that day', + 'Σ': '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 +95,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 +108,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) @@ -135,6 +139,7 @@ if output_type == 'html':