Move CrossValidator to a separate validation module

2 files changed, 5 insertions, 5 deletions

diff --git a/bin/analyze-archive.py b/bin/analyze-archive.py
index 9a95c0b..bf9e511 100755
--- a/bin/analyze-archive.py
+++ b/bin/analyze-archive.py
@@ -115,7 +115,7 @@ 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.dfatool import CrossValidator
+from dfatool.validation import CrossValidator
 from dfatool.utils import filter_aggregate_by_param
 from dfatool.automata import PTA
 
@@ -651,7 +651,7 @@ if __name__ == "__main__":
                     )
                     print(
                         "{:10s}  {}".format(
-                            "", param_info(state, attribute)["function"].model_args,
+                            "", param_info(state, attribute)["function"].model_args
                         )
                     )
         for trans in model.transitions():
@@ -666,7 +666,7 @@ if __name__ == "__main__":
                     )
                     print(
                         "{:10s}  {:10s}  {}".format(
-                            "", "", param_info(trans, attribute)["function"].model_args,
+                            "", "", param_info(trans, attribute)["function"].model_args
                         )
                     )
 
diff --git a/bin/analyze-timing.py b/bin/analyze-timing.py
index 0747ed8..8c7ee5b 100755
--- a/bin/analyze-timing.py
+++ b/bin/analyze-timing.py
@@ -80,7 +80,7 @@ import sys
 from dfatool import plotter
 from dfatool.dfatool import AnalyticModel, TimingData, pta_trace_to_aggregate
 from dfatool.dfatool import gplearn_to_function
-from dfatool.dfatool import CrossValidator
+from dfatool.validation import CrossValidator
 from dfatool.utils import filter_aggregate_by_param
 from dfatool.parameters import prune_dependent_parameters
 
@@ -428,7 +428,7 @@ if __name__ == "__main__":
                     )
                     print(
                         "{:10s}  {:10s}  {}".format(
-                            "", "", param_info(trans, attribute)["function"].model_args,
+                            "", "", param_info(trans, attribute)["function"].model_args
                         )
                     )