Skip to content

Commit b7bb636

Browse files
committedJul 6, 2022
renamed outliering function name
1 parent 1650a8f commit b7bb636

40 files changed

+24
-24
lines changed
 

‎statistical_methods_library/outliering.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class Marker(Enum):
3131
"""The value has not been winsorised because design * calibration is <= 1."""
3232

3333

34-
def winsorisation(
34+
def winsorise(
3535
input_df: DataFrame,
3636
reference_col: str,
3737
period_col: str,

‎tests/test_outlering.py

+23-23
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"tests",
7575
"fixture_data",
7676
"outliering",
77-
"winsorisation",
77+
"winsorise",
7878
f"{scenario_category}_scenarios",
7979
"*_input.csv",
8080
)
@@ -94,7 +94,7 @@
9494
def test_input_not_a_dataframe():
9595
with pytest.raises(TypeError):
9696
# noinspection PyTypeChecker
97-
outliering.winsorisation("not_a_dataframe", *params)
97+
outliering.winsorise("not_a_dataframe", *params)
9898

9999

100100
# --- Test if params not strings ---
@@ -106,7 +106,7 @@ def test_params_not_string(fxt_load_test_csv):
106106
dataframe_columns,
107107
dataframe_types,
108108
"outliering",
109-
"winsorisation",
109+
"winsorise",
110110
"unit",
111111
"basic_functionality",
112112
)
@@ -120,7 +120,7 @@ def test_params_not_string(fxt_load_test_csv):
120120
outlier_weight_col,
121121
)
122122
with pytest.raises(TypeError):
123-
outliering.winsorisation(test_dataframe, *bad_params)
123+
outliering.winsorise(test_dataframe, *bad_params)
124124

125125

126126
# --- Test if params null ---
@@ -132,7 +132,7 @@ def test_params_null(fxt_load_test_csv):
132132
dataframe_columns,
133133
dataframe_types,
134134
"outliering",
135-
"winsorisation",
135+
"winsorise",
136136
"unit",
137137
"basic_functionality",
138138
)
@@ -146,7 +146,7 @@ def test_params_null(fxt_load_test_csv):
146146
outlier_weight_col,
147147
)
148148
with pytest.raises(ValueError):
149-
outliering.winsorisation(test_dataframe, *bad_params)
149+
outliering.winsorise(test_dataframe, *bad_params)
150150

151151

152152
# --- Test validation fail if mismatched calibration cols ---
@@ -158,7 +158,7 @@ def test_params_mismatched_calibration_cols(fxt_load_test_csv):
158158
dataframe_columns,
159159
dataframe_types,
160160
"outliering",
161-
"winsorisation",
161+
"winsorise",
162162
"unit",
163163
"basic_functionality",
164164
)
@@ -173,7 +173,7 @@ def test_params_mismatched_calibration_cols(fxt_load_test_csv):
173173
calibration_weight_col,
174174
)
175175
with pytest.raises(TypeError):
176-
outliering.winsorisation(test_dataframe, *bad_params)
176+
outliering.winsorise(test_dataframe, *bad_params)
177177

178178

179179
# --- Test validation fail if nulls in data ---
@@ -185,12 +185,12 @@ def test_dataframe_nulls_in_data(fxt_load_test_csv):
185185
dataframe_columns,
186186
dataframe_types,
187187
"outliering",
188-
"winsorisation",
188+
"winsorise",
189189
"unit",
190190
"null_value_present",
191191
)
192192
with pytest.raises(outliering.ValidationError):
193-
outliering.winsorisation(test_dataframe, *params)
193+
outliering.winsorise(test_dataframe, *params)
194194

195195

196196
# --- Test if cols missing from input dataframe(s) ---
@@ -202,13 +202,13 @@ def test_dataframe_column_missing(fxt_load_test_csv):
202202
dataframe_columns,
203203
dataframe_types,
204204
"outliering",
205-
"winsorisation",
205+
"winsorise",
206206
"unit",
207207
"basic_functionality",
208208
)
209209
bad_dataframe = test_dataframe.drop(target_col)
210210
with pytest.raises(outliering.ValidationError):
211-
outliering.winsorisation(bad_dataframe, *params)
211+
outliering.winsorise(bad_dataframe, *params)
212212

213213

214214
# --- Test if output contents are as expected, both new columns and data ---
@@ -220,13 +220,13 @@ def test_dataframe_returned_as_expected(fxt_spark_session, fxt_load_test_csv):
220220
dataframe_columns,
221221
dataframe_types,
222222
"outliering",
223-
"winsorisation",
223+
"winsorise",
224224
"unit",
225225
"basic_functionality",
226226
)
227227
# Make sure that no extra columns pass through.
228228
test_dataframe = test_dataframe.withColumn("bonus_column", lit(0))
229-
ret_val = outliering.winsorisation(test_dataframe, *params)
229+
ret_val = outliering.winsorise(test_dataframe, *params)
230230
# perform action on the dataframe to trigger lazy evaluation...
231231
ret_val.count()
232232
# ...and then check
@@ -242,11 +242,11 @@ def test_dataframe_expected_columns(fxt_spark_session, fxt_load_test_csv):
242242
dataframe_columns,
243243
dataframe_types,
244244
"outliering",
245-
"winsorisation",
245+
"winsorise",
246246
"unit",
247247
"basic_functionality",
248248
)
249-
ret_val = outliering.winsorisation(
249+
ret_val = outliering.winsorise(
250250
test_dataframe,
251251
*default_params,
252252
)
@@ -283,7 +283,7 @@ def test_calculations(fxt_load_test_csv, scenario_type, scenario):
283283
dataframe_columns,
284284
dataframe_types,
285285
"outliering",
286-
"winsorisation",
286+
"winsorise",
287287
scenario_type,
288288
f"{scenario}_input",
289289
)
@@ -297,12 +297,12 @@ def test_calculations(fxt_load_test_csv, scenario_type, scenario):
297297
dataframe_columns,
298298
dataframe_types,
299299
"outliering",
300-
"winsorisation",
300+
"winsorise",
301301
scenario_type,
302302
f"{scenario}_output",
303303
)
304304

305-
ret_val = outliering.winsorisation(test_dataframe, *params, **winsorisation_kwargs)
305+
ret_val = outliering.winsorise(test_dataframe, *params, **winsorisation_kwargs)
306306

307307
assert isinstance(ret_val, type(test_dataframe))
308308
sort_col_list = [reference_col, period_col]
@@ -320,13 +320,13 @@ def test_winsorise_different_stratum_l_values_in_same_period_fails(fxt_load_test
320320
dataframe_columns,
321321
dataframe_types,
322322
"outliering",
323-
"winsorisation",
323+
"winsorise",
324324
"unit",
325325
"different_l_values_stratum_same_period",
326326
)
327327

328328
with pytest.raises(outliering.ValidationError):
329-
outliering.winsorisation(
329+
outliering.winsorise(
330330
test_dataframe,
331331
*default_params,
332332
)
@@ -340,12 +340,12 @@ def test_winsorise_different_stratum_l_values_in_different_periods_succeeds(
340340
dataframe_columns,
341341
dataframe_types,
342342
"outliering",
343-
"winsorisation",
343+
"winsorise",
344344
"unit",
345345
"different_l_values_stratum_different_periods",
346346
)
347347

348-
outliering.winsorisation(
348+
outliering.winsorise(
349349
test_dataframe,
350350
*default_params,
351351
)

0 commit comments

Comments
 (0)
Please sign in to comment.