Add function override support to AnalyticModel, analyze-timing.py

1 files changed, 29 insertions, 0 deletions

diff --git a/test/test_timingharness.py b/test/test_timingharness.py
index b5937ad..5fb5fb1 100755
--- a/test/test_timingharness.py
+++ b/test/test_timingharness.py
@@ -49,6 +49,7 @@ class TestModels(unittest.TestCase):
             self.assertAlmostEqual(model.stats.param_dependence_ratio(transition, 'duration', 'channel'), 0, places=2)
 
         param_model, param_info = model.get_fitted()
+        self.assertEqual(param_info('getObserveTx', 'duration'), None)
         self.assertEqual(param_info('setPALevel', 'duration'), None)
         self.assertEqual(param_info('setRetries', 'duration'), None)
         self.assertEqual(param_info('setup', 'duration'), None)
@@ -59,6 +60,34 @@ class TestModels(unittest.TestCase):
         self.assertAlmostEqual(param_info('write', 'duration')['function']._regression_args[2], 1, places=0)
         self.assertAlmostEqual(param_info('write', 'duration')['function']._regression_args[3], 1, places=0)
 
+    def test_function_override(self):
+        raw_data = TimingData(['test-data/20190815_122531_nRF24_no-rx.json'])
+        preprocessed_data = raw_data.get_preprocessed_data(verbose = False)
+        by_name, parameters, arg_count = pta_trace_to_aggregate(preprocessed_data)
+        model = AnalyticModel(by_name, parameters, arg_count, verbose = False, function_override={('write', 'duration'): '(parameter(auto_ack!) * (regression_arg(0) + regression_arg(1) * parameter(max_retry_count) + regression_arg(2) * parameter(retry_delay) + regression_arg(3) * parameter(max_retry_count) * parameter(retry_delay))) + ((1 - parameter(auto_ack!)) * regression_arg(4))'})
+        self.assertEqual(model.names, 'setAutoAck setPALevel setRetries setup write'.split(' '))
+        static_model = model.get_static()
+        self.assertAlmostEqual(static_model('setAutoAck', 'duration'), 72, places=0)
+        self.assertAlmostEqual(static_model('setPALevel', 'duration'), 146, places=0)
+        self.assertAlmostEqual(static_model('setRetries', 'duration'), 73, places=0)
+        self.assertAlmostEqual(static_model('setup', 'duration'), 6533, places=0)
+        self.assertAlmostEqual(static_model('write', 'duration'), 1181, places=0)
+
+        for transition in 'setAutoAck setPALevel setRetries setup write'.split(' '):
+            self.assertAlmostEqual(model.stats.param_dependence_ratio(transition, 'duration', 'channel'), 0, places=2)
+
+        param_model, param_info = model.get_fitted()
+        self.assertEqual(param_info('setAutoAck', 'duration'), None)
+        self.assertEqual(param_info('setPALevel', 'duration'), None)
+        self.assertEqual(param_info('setRetries', 'duration'), None)
+        self.assertEqual(param_info('setup', 'duration'), None)
+        self.assertEqual(param_info('write', 'duration')['function']._model_str, '(parameter(auto_ack!) * (regression_arg(0) + regression_arg(1) * parameter(max_retry_count) + regression_arg(2) * parameter(retry_delay) + regression_arg(3) * parameter(max_retry_count) * parameter(retry_delay))) + ((1 - parameter(auto_ack!)) * regression_arg(4))')
+
+        self.assertAlmostEqual(param_info('write', 'duration')['function']._regression_args[0], 1162, places=0)
+        self.assertAlmostEqual(param_info('write', 'duration')['function']._regression_args[1], 464, places=0)
+        self.assertAlmostEqual(param_info('write', 'duration')['function']._regression_args[2], 1, places=0)
+        self.assertAlmostEqual(param_info('write', 'duration')['function']._regression_args[3], 1, places=0)
+        self.assertAlmostEqual(param_info('write', 'duration')['function']._regression_args[4], 1086, places=0)
 
 if __name__ == '__main__':
     unittest.main()