X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Futils.py;h=a15742a21f55f3798182e0609271779ad82d0963;hp=0e72a063439294a74b735390f2bd1f6c410b3f1c;hb=52f64f232293130904d54a62609eaffc1b145608;hpb=85a5bd538583f33dc63e072cfa4b3b6750958191

diff --git a/resources/tools/presentation/utils.py b/resources/tools/presentation/utils.py
index 0e72a06343..a15742a21f 100644
--- a/resources/tools/presentation/utils.py
+++ b/resources/tools/presentation/utils.py
@@ -36,10 +36,7 @@ def mean(items):
     :rtype: float
     """
 
-    if len(items):
-        return float(sum(items)) / len(items)
-    else:
-        return None
+    return float(sum(items)) / len(items)
 
 
 def stdev(items):
@@ -84,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):