Remove unimplemented discard-outliers options

5 files changed, 4 insertions, 36 deletions

diff --git a/bin/analyze-archive.py b/bin/analyze-archive.py
index 5c7c97e..c531bb6 100755
--- a/bin/analyze-archive.py
+++ b/bin/analyze-archive.py
@@ -61,9 +61,6 @@ Options:
     Specify traces which should be ignored due to bogus data. 1 is the first
     trace, 2 the second, and so on.
 
---discard-outliers=
-    not supported at the moment
-
 --cross-validate=<method>:<count>
     Perform cross validation when computing model quality.
     Only works with --show-quality=table at the moment.
@@ -291,7 +288,6 @@ def print_html_model_data(model, pm, pq, lm, lq, am, ai, aq):
 if __name__ == "__main__":
 
     ignored_trace_indexes = []
-    discard_outliers = None
     safe_functions_enabled = False
     function_override = {}
     show_models = []
@@ -306,7 +302,7 @@ if __name__ == "__main__":
         optspec = (
             "info "
             "plot-unparam= plot-param= plot-traces= show-models= show-quality= "
-            "ignored-trace-indexes= discard-outliers= function-override= "
+            "ignored-trace-indexes= function-override= "
             "export-traces= "
             "filter-param= "
             "log-level= "
@@ -326,9 +322,6 @@ if __name__ == "__main__":
             if 0 in ignored_trace_indexes:
                 print("[E] arguments to --ignored-trace-indexes start from 1")
 
-        if "discard-outliers" in opt:
-            discard_outliers = float(opt["discard-outliers"])
-
         if "function-override" in opt:
             for function_desc in opt["function-override"].split(";"):
                 state_or_tran, attribute, *function_str = function_desc.split(" ")
@@ -457,7 +450,6 @@ if __name__ == "__main__":
         parameters,
         arg_count,
         traces=preprocessed_data,
-        discard_outliers=discard_outliers,
         function_override=function_override,
         pta=pta,
     )
diff --git a/bin/analyze-timing.py b/bin/analyze-timing.py
index ed9c571..ddd49ec 100755
--- a/bin/analyze-timing.py
+++ b/bin/analyze-timing.py
@@ -172,7 +172,6 @@ def print_text_model_data(model, pm, pq, lm, lq, am, ai, aq):
 if __name__ == "__main__":
 
     ignored_trace_indexes = []
-    discard_outliers = None
     safe_functions_enabled = False
     function_override = {}
     show_models = []
@@ -185,7 +184,7 @@ if __name__ == "__main__":
     try:
         optspec = (
             "plot-unparam= plot-param= show-models= show-quality= "
-            "ignored-trace-indexes= discard-outliers= function-override= "
+            "ignored-trace-indexes= function-override= "
             "filter-param= "
             "log-level= "
             "cross-validate= "
@@ -205,9 +204,6 @@ if __name__ == "__main__":
             if 0 in ignored_trace_indexes:
                 print("[E] arguments to --ignored-trace-indexes start from 1")
 
-        if "discard-outliers" in opt:
-            discard_outliers = float(opt["discard-outliers"])
-
         if "function-override" in opt:
             for function_desc in opt["function-override"].split(";"):
                 state_or_tran, attribute, *function_str = function_desc.split(" ")
diff --git a/bin/eval-rel-energy.py b/bin/eval-rel-energy.py
index 66c3ae2..aeaf88c 100755
--- a/bin/eval-rel-energy.py
+++ b/bin/eval-rel-energy.py
@@ -23,7 +23,6 @@ def get_file_groups(args):
 if __name__ == "__main__":
 
     ignored_trace_indexes = []
-    discard_outliers = None
     safe_functions_enabled = False
     function_override = {}
     show_models = []
@@ -32,7 +31,7 @@ if __name__ == "__main__":
     try:
         optspec = (
             "plot-unparam= plot-param= show-models= show-quality= "
-            "ignored-trace-indexes= discard-outliers= function-override= "
+            "ignored-trace-indexes= function-override= "
             "with-safe-functions"
         )
         raw_opts, args = getopt.getopt(sys.argv[1:], "", optspec.split(" "))
@@ -48,9 +47,6 @@ if __name__ == "__main__":
                 if 0 in ignored_trace_indexes:
                     print("[E] arguments to --ignored-trace-indexes start from 1")
 
-            if "discard-outliers" in opt:
-                discard_outliers = float(opt["discard-outliers"])
-
             if "function-override" in opt:
                 for function_desc in opt["function-override"].split(";"):
                     state_or_tran, attribute, *function_str = function_desc.split(" ")
@@ -89,7 +85,6 @@ if __name__ == "__main__":
             arg_count,
             traces=preprocessed_data,
             ignore_trace_indexes=ignored_trace_indexes,
-            discard_outliers=discard_outliers,
             function_override=function_override,
             verbose=False,
         )
diff --git a/bin/test_corrcoef.py b/bin/test_corrcoef.py
index b8c8eae..ccb3366 100755
--- a/bin/test_corrcoef.py
+++ b/bin/test_corrcoef.py
@@ -111,7 +111,6 @@ def print_text_model_data(model, pm, pq, lm, lq, am, ai, aq):
 if __name__ == "__main__":
 
     ignored_trace_indexes = None
-    discard_outliers = None
     safe_functions_enabled = False
     function_override = {}
     show_models = []
@@ -120,7 +119,7 @@ if __name__ == "__main__":
     try:
         optspec = (
             "plot-unparam= plot-param= show-models= show-quality= "
-            "ignored-trace-indexes= discard-outliers= function-override= "
+            "ignored-trace-indexes= function-override= "
             "with-safe-functions"
         )
         raw_opts, args = getopt.getopt(sys.argv[1:], "", optspec.split(" "))
@@ -136,9 +135,6 @@ if __name__ == "__main__":
                 if 0 in ignored_trace_indexes:
                     print("[E] arguments to --ignored-trace-indexes start from 1")
 
-            if "discard-outliers" in opt:
-                discard_outliers = float(opt["discard-outliers"])
-
             if "function-override" in opt:
                 for function_desc in opt["function-override"].split(";"):
                     state_or_tran, attribute, *function_str = function_desc.split(" ")
@@ -170,7 +166,6 @@ if __name__ == "__main__":
         arg_count,
         traces=preprocessed_data,
         ignore_trace_indexes=ignored_trace_indexes,
-        discard_outliers=discard_outliers,
         function_override=function_override,
         use_corrcoef=False,
     )
@@ -180,7 +175,6 @@ if __name__ == "__main__":
         arg_count,
         traces=preprocessed_data,
         ignore_trace_indexes=ignored_trace_indexes,
-        discard_outliers=discard_outliers,
         function_override=function_override,
         use_corrcoef=True,
     )
diff --git a/lib/model.py b/lib/model.py
index e908af4..082fe8a 100644
--- a/lib/model.py
+++ b/lib/model.py
@@ -700,7 +700,6 @@ class PTAModel:
         arg_count,
         traces=[],
         ignore_trace_indexes=[],
-        discard_outliers=None,
         function_override={},
         use_corrcoef=False,
         pta=None,
@@ -716,13 +715,6 @@ class PTAModel:
         arg_count -- function arguments, as returned by pta_trace_to_aggregate
         traces -- list of preprocessed DFA traces, as returned by RawData.get_preprocessed_data()
         ignore_trace_indexes -- list of trace indexes. The corresponding traces will be ignored.
-        discard_outliers -- currently not supported: threshold for outlier detection and removel (float).
-            Outlier detection is performed individually for each state/transition in each trace,
-            so it only works if the benchmark ran several times.
-            Given "data" (a set of measurements of the same thing, e.g. TX duration in the third benchmark trace),
-            "m" (the median of all attribute measurements with the same parameters, which may include data from other traces),
-            a data point X is considered an outlier if
-            | 0.6745 * (X - m) / median(|data - m|) | > discard_outliers .
         function_override -- dict of overrides for automatic parameter function generation.
             If (state or transition name, model attribute) is present in function_override,
             the corresponding text string is the function used for analytic (parameter-aware/fitted)
@@ -749,7 +741,6 @@ class PTAModel:
         )
         self.cache = {}
         np.seterr("raise")
-        self._outlier_threshold = discard_outliers
         self.function_override = function_override.copy()
         self.pta = pta
         self.ignore_trace_indexes = ignore_trace_indexes