From 8f426980c73e1fd166cfa96e02c88e04e85a2cfa Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Mon, 11 Jan 2021 16:20:50 +0100 Subject: evaluate E = P*t model. Seems slightly better in some cases TODO: Fix send duration model generation for cc1200, should improve eval --- lib/model.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'lib/model.py') diff --git a/lib/model.py b/lib/model.py index 781a29c..9070ece 100644 --- a/lib/model.py +++ b/lib/model.py @@ -1132,6 +1132,22 @@ class PTAModel: ) measures = regression_measures(predicted_data, elem[key]) detailed_results[name][key] = measures + if elem["isa"] == "transition": + predicted_data = np.array( + list( + map( + lambda i: model_function( + name, "power", param=elem["param"][i] + ) + * model_function(name, "duration", param=elem["param"][i]), + range(len(elem["power"])), + ) + ) + ) + measures = regression_measures( + predicted_data, elem["power"] * elem["duration"] + ) + detailed_results[name]["energy_Pt"] = measures return {"by_name": detailed_results} -- cgit v1.2.3