Merge branch 'master' into janis

1 files changed, 4 insertions, 9 deletions

diff --git a/bin/test_corrcoef.py b/bin/test_corrcoef.py
index 0b1ca54..ccb3366 100755
--- a/bin/test_corrcoef.py
+++ b/bin/test_corrcoef.py
@@ -4,8 +4,9 @@ import getopt
 import re
 import sys
 from dfatool import plotter
-from dfatool.dfatool import PTAModel, RawData, pta_trace_to_aggregate
-from dfatool.dfatool import gplearn_to_function
+from dfatool.loader import RawData, pta_trace_to_aggregate
+from dfatool.functions import gplearn_to_function
+from dfatool.model import PTAModel
 
 opt = dict()
 
@@ -110,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 = []
@@ -119,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(" "))
@@ -135,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(" ")
@@ -169,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,
     )
@@ -179,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,
     )