X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Futils.py;h=a15742a21f55f3798182e0609271779ad82d0963;hp=bc62268937d339e3faa224b109f611fb7d904f3f;hb=52f64f232293130904d54a62609eaffc1b145608;hpb=4f5872c1bb23873b3a93cb471aae8700d5ca029d diff --git a/resources/tools/presentation/utils.py b/resources/tools/presentation/utils.py index bc62268937..a15742a21f 100644 --- a/resources/tools/presentation/utils.py +++ b/resources/tools/presentation/utils.py @@ -67,6 +67,7 @@ def relative_change(nr1, nr2): return float(((nr2 - nr1) / nr1) * 100) + def remove_outliers(input_list, outlier_const=1.5, window=14): """Return list with outliers removed, using split_outliers. @@ -80,15 +81,26 @@ def remove_outliers(input_list, outlier_const=1.5, window=14): :rtype: list of floats """ - input_series = pd.Series() - for index, value in enumerate(input_list): - item_pd = pd.Series([value, ], index=[index, ]) - input_series.append(item_pd) - output_series, _ = split_outliers(input_series, outlier_const=outlier_const, - window=window) - output_list = [y for x, y in output_series.items() if not np.isnan(y)] - - return output_list + data = np.array(input_list) + upper_quartile = np.percentile(data, 75) + lower_quartile = np.percentile(data, 25) + iqr = (upper_quartile - lower_quartile) * outlier_const + quartile_set = (lower_quartile - iqr, upper_quartile + iqr) + result_lst = list() + for y in data.tolist(): + if quartile_set[0] <= y <= quartile_set[1]: + result_lst.append(y) + return result_lst + + # input_series = pd.Series() + # for index, value in enumerate(input_list): + # item_pd = pd.Series([value, ], index=[index, ]) + # input_series.append(item_pd) + # output_series, _ = split_outliers(input_series, outlier_const=outlier_const, + # window=window) + # output_list = [y for x, y in output_series.items() if not np.isnan(y)] + # + # return output_list def split_outliers(input_series, outlier_const=1.5, window=14):