X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Futils.py;h=df543c17ea3c437146a82334a2a68f4e253a553c;hb=52cb667958d954d6233d0865a59d90cca82db026;hp=a15742a21f55f3798182e0609271779ad82d0963;hpb=52f64f232293130904d54a62609eaffc1b145608;p=csit.git diff --git a/resources/tools/presentation/utils.py b/resources/tools/presentation/utils.py index a15742a21f..df543c17ea 100644 --- a/resources/tools/presentation/utils.py +++ b/resources/tools/presentation/utils.py @@ -87,21 +87,11 @@ def remove_outliers(input_list, outlier_const=1.5, window=14): iqr = (upper_quartile - lower_quartile) * outlier_const quartile_set = (lower_quartile - iqr, upper_quartile + iqr) result_lst = list() - for y in data.tolist(): + for y in input_list: 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): """Go through the input data and generate two pandas series: @@ -133,9 +123,9 @@ def split_outliers(input_series, outlier_const=1.5, window=14): q1 = np.percentile(y_rolling_array, 25) q3 = np.percentile(y_rolling_array, 75) iqr = (q3 - q1) * outlier_const - low, high = q1 - iqr, q3 + iqr + low = q1 - iqr item_pd = pd.Series([item_y, ], index=[item_x, ]) - if low <= item_y <= high: + if low <= item_y: trimmed_data = trimmed_data.append(item_pd) else: outliers = outliers.append(item_pd) @@ -150,7 +140,7 @@ def get_files(path, extension=None, full_path=True): :param path: Path to files. :param extension: Extension of files to process. If it is the empty string, - all files will be processed. + all files will be processed. :param full_path: If True, the files with full path are generated. :type path: str :type extension: str