Convert PTAModel to EnergyModel signature

outlier detection / removal is not supported at the moment.

1 files changed, 4 insertions, 3 deletions

diff --git a/bin/analyze-archive.py b/bin/analyze-archive.py
index 307cbd2..276daf5 100755
--- a/bin/analyze-archive.py
+++ b/bin/analyze-archive.py
@@ -5,7 +5,7 @@ import json
 import plotter
 import re
 import sys
-from dfatool import PTAModel, RawData
+from dfatool import PTAModel, RawData, pta_trace_to_aggregate
 from dfatool import soft_cast_int, is_numeric, gplearn_to_function
 
 opts = {}
@@ -147,8 +147,9 @@ if __name__ == '__main__':
     raw_data = RawData(args)
 
     preprocessed_data = raw_data.get_preprocessed_data()
-    model = PTAModel(preprocessed_data,
-        ignore_trace_indexes = ignored_trace_indexes,
+    by_name, parameters, arg_count = pta_trace_to_aggregate(preprocessed_data, ignored_trace_indexes)
+    model = PTAModel(by_name, parameters, arg_count,
+        traces = preprocessed_data,
         discard_outliers = discard_outliers,
         function_override = function_override,
         hwmodel = hwmodel)