Skip to content

Commit b38aeb3

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 9537e1e commit b38aeb3

5 files changed

Lines changed: 105 additions & 103 deletions

File tree

src/wristpy/processing/metrics.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@ def mean_amplitude_deviation(
105105
).set_sorted("time")
106106

107107
mad_df = (
108-
mad_lf.group_by_dynamic(index_column="time", every=f"{int(epoch_length*1e9)}ns")
108+
mad_lf.group_by_dynamic(
109+
index_column="time", every=f"{int(epoch_length * 1e9)}ns"
110+
)
109111
.agg(
110112
[
111113
(

tests/unit/test_analytics.py

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ def test_fill_false_blocks() -> None:
3737

3838
result = analytics._fill_false_blocks(sleep_idx_array, gap_block)
3939

40-
assert np.array_equal(
41-
result, expected_result
42-
), f"Expected {expected_result}, but got {result}"
40+
assert np.array_equal(result, expected_result), (
41+
f"Expected {expected_result}, but got {result}"
42+
)
4343

4444

4545
def test_compute_abs_diff_mean_anglez(
@@ -56,9 +56,9 @@ def test_compute_abs_diff_mean_anglez(
5656

5757
result = sleep_detection._compute_abs_diff_mean_anglez(sleep_detection.anglez)
5858

59-
assert np.array_equal(
60-
result.measurements, expected_result
61-
), f"Expected {expected_result}, but got {result.measurements}"
59+
assert np.array_equal(result.measurements, expected_result), (
60+
f"Expected {expected_result}, but got {result.measurements}"
61+
)
6262
assert np.array_equal(len(result.time), expected_length)
6363

6464

@@ -92,12 +92,12 @@ def test_spt_window(sleep_detection: analytics.GgirSleepDetection) -> None:
9292

9393
result = sleep_detection._spt_window(sleep_detection.anglez)
9494

95-
assert np.array_equal(
96-
result.measurements, expected_result
97-
), f"Expected {expected_result}, but got {result.measurements}"
98-
assert np.array_equal(
99-
len(result.time), expected_length
100-
), f"Expected {expected_length}, but got {len(result.time)}"
95+
assert np.array_equal(result.measurements, expected_result), (
96+
f"Expected {expected_result}, but got {result.measurements}"
97+
)
98+
assert np.array_equal(len(result.time), expected_length), (
99+
f"Expected {expected_length}, but got {len(result.time)}"
100+
)
101101

102102

103103
def test_spt_window_null(sleep_detection: analytics.GgirSleepDetection) -> None:
@@ -107,12 +107,12 @@ def test_spt_window_null(sleep_detection: analytics.GgirSleepDetection) -> None:
107107

108108
result = sleep_detection._spt_window(sleep_detection.anglez)
109109

110-
assert np.array_equal(
111-
result.measurements, expected_result
112-
), f"Expected {expected_result}, but got {result.measurements}"
113-
assert np.array_equal(
114-
len(result.time), expected_length
115-
), f"Expected {expected_length}, but got {len(result.time)}"
110+
assert np.array_equal(result.measurements, expected_result), (
111+
f"Expected {expected_result}, but got {result.measurements}"
112+
)
113+
assert np.array_equal(len(result.time), expected_length), (
114+
f"Expected {expected_length}, but got {len(result.time)}"
115+
)
116116

117117

118118
def test_calculate_sib_periods(sleep_detection: analytics.GgirSleepDetection) -> None:
@@ -122,12 +122,12 @@ def test_calculate_sib_periods(sleep_detection: analytics.GgirSleepDetection) ->
122122

123123
result = sleep_detection._calculate_sib_periods(sleep_detection.anglez, 10)
124124

125-
assert np.array_equal(
126-
result.measurements, expected_result
127-
), f"Expected {expected_result}, but got {result.measurements}"
128-
assert (
129-
len(result.measurements) == expected_length
130-
), f"Expected {expected_length}, but got {len(result.measurements)}"
125+
assert np.array_equal(result.measurements, expected_result), (
126+
f"Expected {expected_result}, but got {result.measurements}"
127+
)
128+
assert len(result.measurements) == expected_length, (
129+
f"Expected {expected_length}, but got {len(result.measurements)}"
130+
)
131131

132132

133133
def test_find_onset_wakeup_times(sleep_detection: analytics.GgirSleepDetection) -> None:

tests/unit/test_calibration.py

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,12 @@ def test_closest_point_fit() -> None:
116116

117117
linear_transform = calibrator._closest_point_fit((unit_sphere * scale) + offset)
118118

119-
assert np.allclose(
120-
linear_transform.scale, expected_scale, atol=1e-3
121-
), f"Scale is {linear_transform.scale} expected {expected_scale}"
122-
assert np.allclose(
123-
linear_transform.offset, expected_offset, atol=1e-3
124-
), f"Offset is {linear_transform.offset} expected {expected_offset})"
119+
assert np.allclose(linear_transform.scale, expected_scale, atol=1e-3), (
120+
f"Scale is {linear_transform.scale} expected {expected_scale}"
121+
)
122+
assert np.allclose(linear_transform.offset, expected_offset, atol=1e-3), (
123+
f"Offset is {linear_transform.offset} expected {expected_offset})"
124+
)
125125

126126

127127
def test_closest_point_fit_constrainedmin() -> None:
@@ -137,12 +137,12 @@ def test_closest_point_fit_constrainedmin() -> None:
137137

138138
linear_transform = calibrator._closest_point_fit((unit_sphere * scale) + offset)
139139

140-
assert np.allclose(
141-
linear_transform.scale, expected_scale, atol=1e-3
142-
), f"Scale is {linear_transform.scale} expected {expected_scale}"
143-
assert np.allclose(
144-
linear_transform.offset, expected_offset, atol=1e-3
145-
), f"Offset is {linear_transform.offset} expected {expected_offset})"
140+
assert np.allclose(linear_transform.scale, expected_scale, atol=1e-3), (
141+
f"Scale is {linear_transform.scale} expected {expected_scale}"
142+
)
143+
assert np.allclose(linear_transform.offset, expected_offset, atol=1e-3), (
144+
f"Offset is {linear_transform.offset} expected {expected_offset})"
145+
)
146146

147147

148148
def test_closest_point_fit_constrainmin_calibration_error() -> None:
@@ -202,12 +202,12 @@ def test_ggir_calibration_successful() -> None:
202202

203203
linear_transform = calibrator._calibrate(dummy_measure)
204204

205-
assert np.allclose(
206-
linear_transform.scale, expected_scale, atol=1e-3
207-
), f"Scale is {linear_transform.scale} expected {expected_scale}"
208-
assert np.allclose(
209-
linear_transform.offset, expected_offset, atol=1e-3
210-
), f"Offset is {linear_transform.offset} expected {expected_offset}"
205+
assert np.allclose(linear_transform.scale, expected_scale, atol=1e-3), (
206+
f"Scale is {linear_transform.scale} expected {expected_scale}"
207+
)
208+
assert np.allclose(linear_transform.offset, expected_offset, atol=1e-3), (
209+
f"Offset is {linear_transform.offset} expected {expected_offset}"
210+
)
211211

212212

213213
@pytest.mark.parametrize(
@@ -276,12 +276,12 @@ def test_run_ggircalibration() -> None:
276276

277277
result = calibrator.run_calibration(dummy_measure)
278278

279-
assert isinstance(
280-
result, models.Measurement
281-
), f"was expecting type models.Measurement, object is of type {type(result)}"
282-
assert np.allclose(
283-
result.measurements, expected_data.measurements, atol=1e-3
284-
), "Measurement data did not match"
279+
assert isinstance(result, models.Measurement), (
280+
f"was expecting type models.Measurement, object is of type {type(result)}"
281+
)
282+
assert np.allclose(result.measurements, expected_data.measurements, atol=1e-3), (
283+
"Measurement data did not match"
284+
)
285285
assert result.time.equals(expected_data.time), "Time series are not equal"
286286

287287

@@ -309,12 +309,12 @@ def test_run_constrainedmincalibration() -> None:
309309

310310
result = calibrator.run_calibration(dummy_measure)
311311

312-
assert isinstance(
313-
result, models.Measurement
314-
), f"was expecting type models.Measurement, object is of type {type(result)}"
315-
assert np.allclose(
316-
result.measurements, expected_data.measurements, atol=1e-3
317-
), "Measurement data did not match"
312+
assert isinstance(result, models.Measurement), (
313+
f"was expecting type models.Measurement, object is of type {type(result)}"
314+
)
315+
assert np.allclose(result.measurements, expected_data.measurements, atol=1e-3), (
316+
"Measurement data did not match"
317+
)
318318
assert result.time.equals(expected_data.time), "Time series are not equal"
319319

320320

@@ -342,12 +342,12 @@ def test_run_chunked_calibration() -> None:
342342

343343
result = calibrator.run_calibration(dummy_measure)
344344

345-
assert isinstance(
346-
result, models.Measurement
347-
), f"was expecting type models.Measurement, object is of type {type(result)}"
348-
assert np.allclose(
349-
result.measurements, expected_data.measurements, atol=1e-3
350-
), "Measurement data did not match"
345+
assert isinstance(result, models.Measurement), (
346+
f"was expecting type models.Measurement, object is of type {type(result)}"
347+
)
348+
assert np.allclose(result.measurements, expected_data.measurements, atol=1e-3), (
349+
"Measurement data did not match"
350+
)
351351
assert result.time.equals(expected_data.time), "Time series are not equal"
352352

353353

tests/unit/test_computations.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,9 @@ def test_moving_median(window_size: int, expected_output: np.ndarray) -> None:
181181
f"measurements array are not the same shape. Expected {expected_output.shape}, "
182182
f"instead got: {test_result.measurements.shape}"
183183
)
184-
assert np.all(
185-
np.isclose(test_result.measurements, expected_output)
186-
), "Test results do not match the expected output"
184+
assert np.all(np.isclose(test_result.measurements, expected_output)), (
185+
"Test results do not match the expected output"
186+
)
187187

188188

189189
def test_resample_downsample_simple() -> None:

tests/unit/test_metrics.py

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ def test_euclidean_norm_minus_one(
7070
expected_length = math.ceil(len(test_time) / 5)
7171
enmo_results = metrics.euclidean_norm_minus_one(test_acceleration)
7272

73-
assert np.all(
74-
np.isclose(enmo_results.measurements, expected_enmo)
75-
), f"Expected {expected_enmo}"
73+
assert np.all(np.isclose(enmo_results.measurements, expected_enmo)), (
74+
f"Expected {expected_enmo}"
75+
)
7676

77-
assert (
78-
len(enmo_results.time) == expected_length
79-
), "Input time attribute does not match output time attribute."
77+
assert len(enmo_results.time) == expected_length, (
78+
"Input time attribute does not match output time attribute."
79+
)
8080

8181

8282
@pytest.mark.parametrize(
@@ -106,9 +106,9 @@ def test_angle_relative_to_horizontal(
106106
np.isclose(angle_z_results.measurements, expected_anglez, equal_nan=True)
107107
), f"Expected {expected_anglez}, got: {angle_z_results.measurements}"
108108

109-
assert (
110-
len(angle_z_results.time) == expected_length
111-
), "Input time attribute does not match output time attribute."
109+
assert len(angle_z_results.time) == expected_length, (
110+
"Input time attribute does not match output time attribute."
111+
)
112112

113113

114114
@pytest.mark.parametrize(
@@ -130,9 +130,9 @@ def test_cleanup_isolated_ones_nonwear_value(
130130
"""Test the cleanup isolated ones nonwear value function."""
131131
test_result = metrics._cleanup_isolated_ones_nonwear_value(nonwear_value_array)
132132

133-
assert np.all(
134-
test_result == expected_result
135-
), f"Expected {expected_result}, got: {test_result}"
133+
assert np.all(test_result == expected_result), (
134+
f"Expected {expected_result}, got: {test_result}"
135+
)
136136

137137

138138
def test_group_acceleration_data_by_time() -> None:
@@ -173,9 +173,9 @@ def test_compute_nonwear_value_per_axis(
173173
acceleration_grouped["X"], std_criteria=modifier
174174
)
175175

176-
assert (
177-
test_resultx == expected_result
178-
), f"Expected {expected_result}, got: {test_resultx}"
176+
assert test_resultx == expected_result, (
177+
f"Expected {expected_result}, got: {test_resultx}"
178+
)
179179

180180

181181
def test_compute_nonwear_value_array(create_acceleration: pl.DataFrame) -> None:
@@ -194,12 +194,12 @@ def test_compute_nonwear_value_array(create_acceleration: pl.DataFrame) -> None:
194194
std_criteria=1,
195195
)
196196

197-
assert np.all(
198-
test_result == expected_result
199-
), f"Expected {expected_result}, got: {test_result}"
200-
assert (
201-
len(test_result) == expected_time_length
202-
), f"Expected time to be {expected_time_length}, got: {len(test_result)}"
197+
assert np.all(test_result == expected_result), (
198+
f"Expected {expected_result}, got: {test_result}"
199+
)
200+
assert len(test_result) == expected_time_length, (
201+
f"Expected time to be {expected_time_length}, got: {len(test_result)}"
202+
)
203203

204204

205205
@pytest.mark.parametrize(
@@ -229,12 +229,12 @@ def test_detect_nonwear(
229229
std_criteria=modifier,
230230
)
231231

232-
assert np.all(
233-
test_result.measurements == modifier
234-
), f"Expected non-wear flag value to be {expected_result}, got: {test_result}"
235-
assert (
236-
len(test_result.time) == expected_time_length
237-
), f"Expected time to be {expected_time_length}, got: {len(test_result.time)}"
232+
assert np.all(test_result.measurements == modifier), (
233+
f"Expected non-wear flag value to be {expected_result}, got: {test_result}"
234+
)
235+
assert len(test_result.time) == expected_time_length, (
236+
f"Expected time to be {expected_time_length}, got: {len(test_result.time)}"
237+
)
238238

239239

240240
def test_mean_amplitude_deviation_function(create_acceleration: pl.DataFrame) -> None:
@@ -245,12 +245,12 @@ def test_mean_amplitude_deviation_function(create_acceleration: pl.DataFrame) ->
245245

246246
test_result = metrics.mean_amplitude_deviation(acceleration)
247247

248-
assert np.all(
249-
test_result.measurements == expected_result
250-
), f"Expected MAD value to be {expected_result}, got: {test_result}"
251-
assert (
252-
len(test_result.time) == expected_time
253-
), f"Expected time to be {expected_time}, got: {len(test_result.time)}"
248+
assert np.all(test_result.measurements == expected_result), (
249+
f"Expected MAD value to be {expected_result}, got: {test_result}"
250+
)
251+
assert len(test_result.time) == expected_time, (
252+
f"Expected time to be {expected_time}, got: {len(test_result.time)}"
253+
)
254254

255255

256256
def test_ag_counts_null(create_acceleration: pl.DataFrame) -> None:
@@ -262,9 +262,9 @@ def test_ag_counts_null(create_acceleration: pl.DataFrame) -> None:
262262

263263
ag_counts = metrics.actigraph_activity_counts(acceleration)
264264

265-
assert np.all(
266-
ag_counts.measurements == expected_result
267-
), f"Expected activity counts to be {expected_result}, got: {ag_counts}"
265+
assert np.all(ag_counts.measurements == expected_result), (
266+
f"Expected activity counts to be {expected_result}, got: {ag_counts}"
267+
)
268268
assert len(ag_counts.time) == expected_time
269269

270270

@@ -295,9 +295,9 @@ def test_ag_counts_max() -> None:
295295

296296
ag_counts = metrics.actigraph_activity_counts(acceleration)
297297

298-
assert np.all(
299-
ag_counts.measurements[2:] == expected_result
300-
), f"Expected activity counts to be {expected_result}, got: {ag_counts}"
298+
assert np.all(ag_counts.measurements[2:] == expected_result), (
299+
f"Expected activity counts to be {expected_result}, got: {ag_counts}"
300+
)
301301

302302

303303
@pytest.mark.parametrize("temp_length", [498, 500])

0 commit comments

Comments
 (0)