Skip to content

Commit 004a774

Browse files
authored
1226 Remove duplicates in python docstrings(#1227)
1 parent d33b623 commit 004a774

File tree

18 files changed

+113
-297
lines changed

18 files changed

+113
-297
lines changed

pycode/memilio-epidata/memilio/epidata/customPlot.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,9 @@ def plot_multiple_series(
5454
:param innercolor: Inner color of figure. (Default value = 'white')
5555
:param fig_name: name of the figure to save. (Default value = 'customPlot')
5656
:param loc_legend: (Default value = 'upper left')
57-
:param fig_size: (Default value = (10)
58-
:param 6):
57+
:param fig_size: (Default value = (10, 6))
5958
:param plot_outside: (Default value = True)
6059
:param path_rel: (Default value = 'figures/')
61-
:param innercolor: (Default value = 'white')
6260
6361
"""
6462
fig, ax = plt.subplots(figsize=fig_size, facecolor=outercolor)

pycode/memilio-epidata/memilio/epidata/getCaseData.py

+21-57
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,9 @@ def check_for_completeness(df: pd.DataFrame,
6060
Note: There is no check if data for every day and every county is available (which can happen).
6161
6262
:param df: pd.Dataframe. Dataframe to check
63-
:param merge_berlin: bool True or False. Defines if Berlin's districts are kept separated or get merged. Default defined in defaultDict.
64-
:param merge_eisenach: bool True or False. Defines if Eisenbach districts are kept separated or get merged. Default defined in defaultDict.
63+
:param merge_berlin: bool True or False. Defines if Berlin's districts are kept separated or get merged. Default value = false
64+
:param merge_eisenach: bool True or False. Defines if Eisenbach districts are kept separated or get merged. Default value = True.
6565
:param run_checks: bool
66-
:param df: pd.DataFrame:
67-
:param run_checks: bool:
68-
:param merge_berlin: bool: (Default value = False)
69-
:param merge_eisenach: bool: (Default value = True)
7066
:returns: Boolean to say if data is complete or not
7167
7268
"""
@@ -105,10 +101,7 @@ def fetch_case_data(
105101
:param filename: str
106102
Name of the full dataset filename
107103
:param conf_obj: configuration object
108-
:param read_data: bool. Defines if data is read from file or downloaded. Default defined in defaultDict.
109-
:param directory: str:
110-
:param filename: str:
111-
:param read_data: bool: (Default value = dd.defaultDict['read_data'])
104+
:param read_data: bool. Defines if data is read from file or downloaded. (Default value = dd.defaultDict['read_data'])
112105
:returns: df pd.Dataframe. Dataframe containing the downloaded case data
113106
114107
"""
@@ -201,13 +194,8 @@ def preprocess_case_data(raw_df: pd.DataFrame,
201194
:param filename: str
202195
Name of the full dataset filename
203196
:param conf_obj: configuration object
204-
:param split_berlin: bool. Defines if Berlin's disctricts are kept separated or get merged. Default defined in defaultDict.
205-
:param rep_date: bool Defines if reporting date or reference date is taken into dataframe. Default defined in defaultDict.
206-
:param raw_df: pd.DataFrame:
207-
:param directory: str:
208-
:param filename: str:
209-
:param split_berlin: bool: (Default value = dd.defaultDict['split_berlin'])
210-
:param rep_date: bool: (Default value = dd.defaultDict['rep_date'])
197+
:param split_berlin: bool. Defines if Berlin's disctricts are kept separated or get merged. Default defined in defaultDict. (Default value = dd.defaultDict['split_berlin'])
198+
:param rep_date: bool Defines if reporting date or reference date is taken into dataframe. Default defined in defaultDict. (Default value = dd.defaultDict['rep_date'])
211199
:returns: df pd.Dataframe
212200
213201
"""
@@ -319,25 +307,15 @@ def write_case_data(df: pd.DataFrame,
319307
Path to the output directory
320308
:param conf_obj: configuration object
321309
:param file_format: str
322-
File format which is used for writing the data. Default defined in defaultDict.
310+
File format which is used for writing the data. Default defined in defaultDict. (Default value = dd.defaultDict['file_format'])
323311
:param start_date: date
324-
Date of first date in dataframe. Default 2020-01-01.
325-
:param end_date: date. Date of last date in dataframe. Default defined in defaultDict.
326-
:param impute_dates: bool True or False. Defines if values for dates without new information are imputed. Default defined in defaultDict.
327-
:param moving_average: int Integers >=0. Applies an 'moving_average'-days moving average on all time series smooth out effects of irregular reporting. Default defined in defaultDict.
328-
:param split_berlin: bool True or False. Defines if Berlin's districts are kept separated or get merged. Default defined in defaultDict.
329-
:param rep_date: bool True or False. Defines if reporting date or reference date is taken into dataframe. Default defined in defaultDict.
312+
Date of first date in dataframe. Default 2020-01-01. (Default value = dd.defaultDict['start_date'])
313+
:param end_date: date. Date of last date in dataframe. Default defined in defaultDict. (Default value = dd.defaultDict['end_date'])
314+
:param impute_dates: bool True or False. Defines if values for dates without new information are imputed. Default defined in defaultDict. (Default value = dd.defaultDict['impute_dates'])
315+
:param moving_average: int Integers >=0. Applies an 'moving_average'-days moving average on all time series smooth out effects of irregular reporting. Default defined in defaultDict. (Default value = dd.defaultDict['moving_average'])
316+
:param split_berlin: bool True or False. Defines if Berlin's districts are kept separated or get merged. Default defined in defaultDict. (Default value = dd.defaultDict['split_berlin'])
317+
:param rep_date: bool True or False. Defines if reporting date or reference date is taken into dataframe. Default defined in defaultDict. (Default value = dd.defaultDict['rep_date'])
330318
:param files: list. List of strings or 'All' or 'Plot'. Defines which files should be provided (and plotted). Default 'All'.
331-
:param df: pd.DataFrame:
332-
:param directory: str:
333-
:param file_format: str: (Default value = dd.defaultDict['file_format'])
334-
:param start_date: date: (Default value = dd.defaultDict['start_date'])
335-
:param end_date: date: (Default value = dd.defaultDict['end_date'])
336-
:param impute_dates: bool: (Default value = dd.defaultDict['impute_dates'])
337-
:param moving_average: int: (Default value = dd.defaultDict['moving_average'])
338-
:param split_berlin: bool: (Default value = dd.defaultDict['split_berlin'])
339-
:param rep_date: bool: (Default value = dd.defaultDict['rep_date'])
340-
:param files: str or list: (Default value = 'All')
341319
:returns: None
342320
343321
"""
@@ -513,31 +491,17 @@ def get_case_data(read_data: bool = dd.defaultDict['read_data'],
513491
- Infected, deaths and recovered split for state and age are stored in "cases_all_state_age"
514492
- Infected, deaths and recovered split for county and age are stored in "cases_all_county_age(_split_berlin)"
515493
516-
:param read_data: True or False. Defines if data is read from file or downloaded. Default defined in defaultDict.
517-
:param file_format: File format which is used for writing the data. Default defined in defaultDict.
518-
:param out_folder: Folder where data is written to. Default defined in defaultDict.
519-
:param start_date: Date of first date in dataframe. Default 2020-01-01.
520-
:param end_date: Date of last date in dataframe. Default defined in defaultDict.
521-
:param impute_dates: True or False. Defines if values for dates without new information are imputed. Default defined in defaultDict.
494+
:param read_data: True or False. Defines if data is read from file or downloaded. Default defined in defaultDict. (Default value = dd.defaultDict['read_data'])
495+
:param file_format: File format which is used for writing the data. Default defined in defaultDict. (Default value = dd.defaultDict['file_format'])
496+
:param out_folder: Folder where data is written to. Default defined in defaultDict. (Default value = dd.defaultDict['out_folder'])
497+
:param start_date: Date of first date in dataframe. (Default value = dd.defaultDict['start_date'])
498+
:param end_date: Date of last date in dataframe. Default defined in defaultDict. (Default value = dd.defaultDict['end_date'])
499+
:param impute_dates: True or False. Defines if values for dates without new information are imputed. Default defined in defaultDict. (Default value = dd.defaultDict['impute_dates'])
522500
:param moving_average: Integers >=0. Applies an 'moving_average'-days moving average on all time series
523-
to smooth out effects of irregular reporting. Default defined in defaultDict.
524-
:param split_berlin: True or False. Defines if Berlin's disctricts are kept separated or get merged. Default defined in defaultDict.
525-
:param rep_date: True or False. Defines if reporting date or reference date is taken into dataframe. Default defined in defaultDict.
501+
to smooth out effects of irregular reporting. Default defined in defaultDict. (Default value = dd.defaultDict['moving_average'])
502+
:param split_berlin: True or False. Defines if Berlin's disctricts are kept separated or get merged. Default defined in defaultDict. (Default value = dd.defaultDict['split_berlin'])
503+
:param rep_date: True or False. Defines if reporting date or reference date is taken into dataframe. Default defined in defaultDict. (Default value = dd.defaultDict['rep_date'])
526504
:param files: List of strings or 'All' or 'Plot'. Defnies which files should be provided (and plotted). Default 'All'.
527-
:param to_dataset: bool True or False. Whether to return the dataframe as an object instead of json file.
528-
If True - returns objects with dataframes
529-
If False - write dataframes into files
530-
Default defined in defaultDict.
531-
:param read_data: bool: (Default value = dd.defaultDict['read_data'])
532-
:param out_folder: str: (Default value = dd.defaultDict['out_folder'])
533-
:param file_format: str: (Default value = dd.defaultDict['file_format'])
534-
:param start_date: date: (Default value = dd.defaultDict['start_date'])
535-
:param end_date: date: (Default value = dd.defaultDict['end_date'])
536-
:param impute_dates: bool: (Default value = dd.defaultDict['impute_dates'])
537-
:param moving_average: int: (Default value = dd.defaultDict['moving_average'])
538-
:param split_berlin: bool: (Default value = dd.defaultDict['split_berlin'])
539-
:param rep_date: bool: (Default value = dd.defaultDict['rep_date'])
540-
:param files: str or list: (Default value = 'All')
541505
:param **kwargs:
542506
:returns: None
543507

pycode/memilio-epidata/memilio/epidata/getCommuterMobility.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ def assign_geographical_entities(countykey_list, govkey_list, run_checks):
6060
6161
Keyword arguments:
6262
63-
:param setup_dict: dictionary with necessary values
6463
:param countykey_list: List of county regional keys.
6564
:param govkey_list: List of governing regions regional keys.
6665
:param run_checks:
@@ -146,9 +145,9 @@ def get_commuter_data(read_data=dd.defaultDict['read_data'],
146145
Keyword arguments:
147146
148147
:param read_data: True or False. Defines if data is read from file or downloaded.
149-
Only for population data. Commuter data is always downloaded. Default defined in defaultDict.
150-
:param file_format: File format which is used for writing the data. Default defined in defaultDict.
151-
:param out_folder: Folder where data is written to. Default defined in defaultDict.
148+
Only for population data. Commuter data is always downloaded. Default defined in defaultDict. (Default value = dd.defaultDict['read_data'])
149+
:param file_format: File format which is used for writing the data. Default defined in defaultDict. (Default value = dd.defaultDict['file_format'])
150+
:param out_folder: Folder where data is written to. Default defined in defaultDict. (Default value = dd.defaultDict['out_folder'])
152151
:param setup_dict: dictionary with necessary values:
153152
'path': String with datapath where mobility files can be found
154153
'abs_tol': tolerated undetected people

pycode/memilio-epidata/memilio/epidata/getDIVIData.py

+17-47
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,8 @@ def fetch_divi_data(
6767
:param conf_obj: configuration object
6868
:param filename: str
6969
File format which is used for writing the data. Default defined in defaultDict.
70-
:param read_data: bool. True or False. Defines if data is read from file or downloaded. Default defined in defaultDict.
71-
:param file_format: str. File format which is used for writing the data. Default defined in defaultDict.
72-
:param directory: str:
73-
:param filename: str:
74-
:param read_data: bool: (Default value = dd.defaultDict['read_data'])
75-
:param file_format: str: (Default value = dd.defaultDict['file_format'])
70+
:param read_data: bool. True or False. Defines if data is read from file or downloaded. Default defined in defaultDict. (Default value = dd.defaultDict['read_data'])
71+
:param file_format: str. File format which is used for writing the data. Default defined in defaultDict. (Default value = dd.defaultDict['file_format'])
7672
:returns: Tuple[df_raw, start_date] Tuple. Contains the fetched data as well as the adjusted starting date
7773
7874
"""
@@ -109,17 +105,10 @@ def preprocess_divi_data(df_raw: pd.DataFrame,
109105
110106
:param df_raw: pd.DataFrame
111107
:param conf_obj: configuration object
112-
:param start_date: date The first date in dataframe. Default defined in defaultDict.
113-
:param end_date: date The last date in dataframe. Default defined in defaultDict.
114-
:param impute_dates: bool Defines if values for dates without new information are imputed. Default defined in defaultDict.
115-
:param moving_average: int Integers >=0.Applies an 'moving_average'-days moving average on all time seriesto smooth out effects of irregular reporting. Default defined in defaultDict.
116-
:param df_raw: pd.DataFrame:
117-
:param start_date: date: (Default value = date(2020)
118-
:param 4:
119-
:param 24):
120-
:param end_date: date: (Default value = dd.defaultDict['end_date'])
121-
:param impute_dates: bool: (Default value = dd.defaultDict['impute_dates'])
122-
:param moving_average: int: (Default value = dd.defaultDict['moving_average'])
108+
:param start_date: date The first date in dataframe. Default value = date(2020, 4, 24).
109+
:param end_date: date The last date in dataframe. Default defined in defaultDict. (Default value = dd.defaultDict['end_date'])
110+
:param impute_dates: bool Defines if values for dates without new information are imputed. Default defined in defaultDict. (Default value = dd.defaultDict['impute_dates'])
111+
:param moving_average: int Integers >=0.Applies an 'moving_average'-days moving average on all time seriesto smooth out effects of irregular reporting. Default defined in defaultDict. (Default value = dd.defaultDict['moving_average'])
123112
:returns: df pd.DataFrame processed divi data
124113
125114
"""
@@ -201,14 +190,9 @@ def write_divi_data(df: pd.DataFrame,
201190
:param directory: str
202191
Path to the output directory
203192
:param conf_obj: configuration object
204-
:param file_format: str. File format which is used for writing the data. Default defined in defaultDict.
205-
:param impute_dates: bool True or False. Defines if values for dates without new information are imputed. Default defined in defaultDict.
206-
:param moving_average: int Integers >=0. Applies an 'moving_average'-days moving average on all time series to smooth out effects of irregular reporting. Default defined in defaultDict.
207-
:param df: pd.DataFrame:
208-
:param directory: str:
209-
:param file_format: str: (Default value = dd.defaultDict['file_format'])
210-
:param impute_dates: bool: (Default value = dd.defaultDict['impute_dates'])
211-
:param moving_average: int: (Default value = dd.defaultDict['moving_average'])
193+
:param file_format: str. File format which is used for writing the data. Default defined in defaultDict. (Default value = dd.defaultDict['file_format'])
194+
:param impute_dates: bool True or False. Defines if values for dates without new information are imputed. Default defined in defaultDict. (Default value = dd.defaultDict['impute_dates'])
195+
:param moving_average: int Integers >=0. Applies an 'moving_average'-days moving average on all time series to smooth out effects of irregular reporting. Default defined in defaultDict. (Default value = dd.defaultDict['moving_average'])
212196
:returns: data_dict Dict Dictionary containing datasets at county, state and national level
213197
214198
"""
@@ -284,27 +268,14 @@ def get_divi_data(read_data: bool = dd.defaultDict['read_data'],
284268
stored in the files "county_divi".json", "state_divi.json" and "germany_divi.json"
285269
for counties, states and whole Germany, respectively.
286270
287-
:param read_data: True or False. Defines if data is read from file or downloaded. Default defined in defaultDict.
288-
:param file_format: File format which is used for writing the data. Default defined in defaultDict.
289-
:param out_folder: Folder where data is written to. Default defined in defaultDict.
290-
:param start_date: Date of first date in dataframe. Default defined in defaultDict.
291-
:param end_date: Date of last date in dataframe. Default defined in defaultDict.
292-
:param impute_dates: True or False. Defines if values for dates without new information are imputed. Default defined in defaultDict.
271+
:param read_data: True or False. Defines if data is read from file or downloaded. Default defined in defaultDict. (Default value = dd.defaultDict['read_data'])
272+
:param file_format: File format which is used for writing the data. Default defined in defaultDict. (Default value = dd.defaultDict['file_format'])
273+
:param out_folder: Folder where data is written to. Default defined in defaultDict. (Default value = dd.defaultDict['out_folder'])
274+
:param start_date: Date of first date in dataframe. Default value = ``date(2020, 4, 24)``.
275+
:param end_date: Date of last date in dataframe. Default defined in defaultDict. (Default value = dd.defaultDict['end_date'])
276+
:param impute_dates: True or False. Defines if values for dates without new information are imputed. Default defined in defaultDict. (Default value = dd.defaultDict['impute_dates'])
293277
:param moving_average: Integers >=0. Applies an 'moving_average'-days moving average on all time series
294-
to smooth out effects of irregular reporting. Default defined in defaultDict.
295-
:param to_dataset: bool True or False. Whether to return the dataframe as an object instead of json file.
296-
If True - returns objects with dataframes
297-
If False - write dataframes into files
298-
Default defined in defaultDict.
299-
:param read_data: bool: (Default value = dd.defaultDict['read_data'])
300-
:param file_format: str: (Default value = dd.defaultDict['file_format'])
301-
:param out_folder: str: (Default value = dd.defaultDict['out_folder'])
302-
:param start_date: date: (Default value = date(2020)
303-
:param 4:
304-
:param 24):
305-
:param end_date: date: (Default value = dd.defaultDict['end_date'])
306-
:param impute_dates: bool: (Default value = dd.defaultDict['impute_dates'])
307-
:param moving_average: int: (Default value = dd.defaultDict['moving_average'])
278+
to smooth out effects of irregular reporting. Default defined in defaultDict. (Default value = dd.defaultDict['moving_average'])
308279
:param **kwargs:
309280
310281
"""
@@ -351,8 +322,7 @@ def divi_data_sanity_checks(df: pd.DataFrame) -> None:
351322
Checks if the headers of the dataframe are those which are needed
352323
Checks if the size of the dataframe is not unusual
353324
354-
:param df: The dataframe which has to be checked
355-
:param df: pd.DataFrame:
325+
:param df: The dataframe which has to be checked pd.DataFrame
356326
357327
"""
358328
# there should be 13 headers

0 commit comments

Comments
 (0)