Skip to content

Commit 404e80d

Browse files
authored
Merge pull request #553 from sgsmob/rename_signals
Update smoothed safegraph signal names
2 parents d049649 + 13618e4 commit 404e80d

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

safegraph/delphi_safegraph/process.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ def process(filenames: List[str],
243243
export_dir)
244244
# ...then as part of the whole window.
245245
process_window(past_week,
246-
add_prefix(add_suffix(signal_names, '_7d_avg'),
246+
add_prefix(add_suffix(signal_names, '_7dav'),
247247
wip_signal,
248248
'wip_'),
249249
geo_resolutions,

safegraph/params.json.template

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"aws_default_region": "",
1010
"aws_endpoint": "",
1111
"sync": true,
12-
"wip_signal" : ["median_home_dwell_time_7d_avg",
13-
"completely_home_prop_7d_avg",
14-
"part_time_work_prop_7d_avg",
15-
"full_time_work_prop_7d_avg"]
12+
"wip_signal" : ["median_home_dwell_time_7dav",
13+
"completely_home_prop_7dav",
14+
"part_time_work_prop_7dav",
15+
"full_time_work_prop_7dav"]
1616
}

safegraph/tests/params.json.template

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"aws_secret_access_key": "",
99
"aws_default_region": "",
1010
"aws_endpoint": "",
11-
"wip_signal" : ["median_home_dwell_time_7d_avg",
12-
"completely_home_prop_7d_avg",
13-
"part_time_work_prop_7d_avg",
14-
"full_time_work_prop_7d_avg"],
11+
"wip_signal" : ["median_home_dwell_time_7dav",
12+
"completely_home_prop_7dav",
13+
"part_time_work_prop_7dav",
14+
"full_time_work_prop_7dav"],
1515
"sync": false
1616
}

safegraph/tests/test_process.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ def test_process(self, tmp_path):
128128
'raw_data/small_raw_data_3.csv'],
129129
SIGNALS,
130130
['median_home_dwell_time',
131-
'completely_home_prop_7d_avg'],
131+
'completely_home_prop_7dav'],
132132
['state'],
133133
export_dir)
134134

@@ -157,25 +157,25 @@ def test_process(self, tmp_path):
157157
'se': [None, 0.005],
158158
'sample_size': [1, 2]
159159
}),
160-
'median_home_dwell_time_7d_avg': pd.DataFrame(data={
160+
'median_home_dwell_time_7dav': pd.DataFrame(data={
161161
'geo_id': ['al', 'ga', 'pa'],
162162
'val': [4.5, 3.5, 7.5],
163163
'se': [1.5, 0.5, 0.5],
164164
'sample_size': [2, 2, 2]
165165
}),
166-
'wip_completely_home_prop_7d_avg': pd.DataFrame(data={
166+
'wip_completely_home_prop_7dav': pd.DataFrame(data={
167167
'geo_id': ['al', 'ga', 'pa'],
168168
'val': [0.1, 0.055, 0.15],
169169
'se': [0.05, 0.005, 0.05],
170170
'sample_size': [2, 2, 2]
171171
}),
172-
'part_time_work_prop_7d_avg': pd.DataFrame(data={
172+
'part_time_work_prop_7dav': pd.DataFrame(data={
173173
'geo_id': ['al', 'ga', 'pa'],
174174
'val': [0.25, 0.055, 0.25],
175175
'se': [0.1, 0.005, 0.05],
176176
'sample_size': [2, 2, 2]
177177
}),
178-
'full_time_work_prop_7d_avg': pd.DataFrame(data={
178+
'full_time_work_prop_7dav': pd.DataFrame(data={
179179
'geo_id': ['al', 'ga', 'pa'],
180180
'val': [0.35, 0.055, 0.35],
181181
'se': [0.1, 0.005, 0.05],

safegraph/tests/test_run.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def test_output_files_exist(self, run_as_module):
2222
single_date_signal = "_".join([date, geo, signal]) + ".csv"
2323
expected_files.add(single_date_signal)
2424
single_date_signal = "_".join(
25-
[date, geo, "wip", signal, "7d_avg"]) + ".csv"
25+
[date, geo, "wip", signal, "7dav"]) + ".csv"
2626
expected_files.add(single_date_signal)
2727

2828
assert expected_files == csv_files

0 commit comments

Comments
 (0)