Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 36 additions & 3 deletions pycode/memilio-epidata/memilio/epidata/getVaccinationData.py
Original file line number Diff line number Diff line change
Expand Up @@ -972,6 +972,11 @@ def write_vaccination_data(dict_data: dict,
dd.EngEng['ageRKI']]).agg(
{column: "sum" for column in vacc_column_names}).reset_index()

df_data_agevacc_ger_cs = df_data_agevacc_county_cs.groupby(
[dd.EngEng['date'],
dd.EngEng['ageRKI']]).agg(
{column: "sum" for column in vacc_column_names}).reset_index()

# make plot of absolute numbers original age resolution
if conf_obj.plot:
# extract (dummy) date column to plt
Expand Down Expand Up @@ -1020,6 +1025,10 @@ def write_vaccination_data(dict_data: dict,
dd.EngEng['idState']]).agg(
{column: "sum" for column in vacc_column_names}).reset_index()

df_data_ger_cs = df_data_county_cs.groupby(
[dd.EngEng['date']]).agg(
{column: "sum" for column in vacc_column_names}).reset_index()

####### age resolved with extrapolation to other age groups #######
# write data frame resolved per county and age (with age classes as
# provided in RKI infection tables: 0-4, 5-14, 15-34, 35-59, 60-79, 80+)
Expand All @@ -1040,6 +1049,11 @@ def write_vaccination_data(dict_data: dict,
dd.EngEng['ageRKI']]).agg(
{column: "sum" for column in vacc_column_names}).reset_index()

df_data_ageinf_ger_cs = df_data_ageinf_county_cs.groupby(
[dd.EngEng['date'],
dd.EngEng['ageRKI']]).agg(
{column: "sum" for column in vacc_column_names}).reset_index()

# make plot of relative numbers of original and extrapolated age resolution
if conf_obj.plot:
# merge Eisenach...
Expand Down Expand Up @@ -1141,6 +1155,12 @@ def write_vaccination_data(dict_data: dict,
gd.write_dataframe(df_data_agevacc_state_cs,
directory, filename, file_format)

# store data for germany
filename = 'vacc_germany_agevacc'
filename = gd.append_filename(filename, impute_dates, moving_average)
gd.write_dataframe(df_data_agevacc_ger_cs,
directory, filename, file_format)

# store data for all counties
filename = 'vacc_county'
filename = gd.append_filename(filename, impute_dates, moving_average)
Expand All @@ -1152,6 +1172,12 @@ def write_vaccination_data(dict_data: dict,
filename = gd.append_filename(filename, impute_dates, moving_average)
gd.write_dataframe(df_data_state_cs, directory, filename, file_format)

# store data for germany
filename = 'vacc_germany'
filename = gd.append_filename(filename, impute_dates, moving_average)
gd.write_dataframe(df_data_ger_cs,
directory, filename, file_format)

####### age resolved with extrapolation to other age groups #######
# write data frame resolved per county and age (with age classes as
# provided in RKI infection tables: 0-4, 5-14, 15-34, 35-59, 60-79, 80+)
Expand All @@ -1168,11 +1194,18 @@ def write_vaccination_data(dict_data: dict,
filename = gd.append_filename(filename, impute_dates, moving_average)
gd.write_dataframe(df_data_ageinf_state_cs,
directory, filename, file_format)

# store data for germany
filename = 'vacc_germany_ageinf'
filename = gd.append_filename(filename, impute_dates, moving_average)
gd.write_dataframe(df_data_ageinf_ger_cs,
directory, filename, file_format)

return None
else:
return (df_data_agevacc_county_cs, df_data_agevacc_state_cs,
df_data_county_cs, df_data_state_cs,
df_data_ageinf_county_cs, df_data_ageinf_state_cs)
return (df_data_agevacc_county_cs, df_data_agevacc_state_cs, df_data_agevacc_ger_cs,
df_data_county_cs, df_data_state_cs, df_data_ger_cs,
df_data_ageinf_county_cs, df_data_ageinf_state_cs, df_data_ageinf_ger_cs)


def get_vaccination_data(
Expand Down
Loading