summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/parameters.py29
-rwxr-xr-xtest/test_ptamodel.py504
2 files changed, 194 insertions, 339 deletions
diff --git a/lib/parameters.py b/lib/parameters.py
index eae04c8..d64be86 100644
--- a/lib/parameters.py
+++ b/lib/parameters.py
@@ -772,13 +772,17 @@ class ModelAttribute:
# TODO remove data entries which are None (and remove corresponding parameters, too!)
- parameter_names = self.param_names
- if len(parameter_names) == 0 or np.std(data) < threshold:
+ param_count = len(self.param_names) + self.arg_count
+ if param_count == 0 or np.std(data) < threshold:
return df.StaticFunction(np.mean(data))
# sf.value_error["std"] = np.std(data)
mean_stds = list()
- for param_index, param in enumerate(parameter_names):
+ for param_index in range(param_count):
+
+ if param_index in self.ignore_param:
+ mean_stds.append(np.inf)
+ continue
unique_values = list(set(map(lambda p: p[param_index], parameters)))
@@ -825,7 +829,14 @@ class ModelAttribute:
# all children have the same configuration. We shouldn't get here due to the threshold check above...
if with_function_leaves:
# try generating a function. if it fails, model_function is a StaticFunction.
- ma = ModelAttribute("tmp", "tmp", data, parameters, self.param_names, 0)
+ ma = ModelAttribute(
+ "tmp",
+ "tmp",
+ data,
+ parameters,
+ self.param_names,
+ arg_count=self.arg_count,
+ )
ParamStats.compute_for_attr(ma)
paramfit = ParamFit(parallel=False)
for key, param, args, kwargs in ma.get_data_for_paramfit():
@@ -833,15 +844,13 @@ class ModelAttribute:
paramfit.fit()
ma.set_data_from_paramfit(paramfit)
return ma.model_function
- else:
- logging.warning(
- f"While building DTree for configurations {parameters}: Children have identical configuration, but high stddev ({np.std(data)}). Falling back to Staticfunction"
- )
+ # else:
+ # logging.warning(
+ # f"While building DTree for configurations {parameters}: Children have identical configuration, but high stddev ({np.std(data)}). Falling back to Staticfunction"
+ # )
return df.StaticFunction(np.mean(data))
symbol_index = np.argmin(mean_stds)
- symbol = parameter_names[symbol_index]
-
unique_values = list(set(map(lambda p: p[symbol_index], parameters)))
child = dict()
diff --git a/test/test_ptamodel.py b/test/test_ptamodel.py
index 2502a39..cf8c60c 100755
--- a/test/test_ptamodel.py
+++ b/test/test_ptamodel.py
@@ -654,6 +654,12 @@ class TestFromFile(unittest.TestCase):
" "
),
)
+
+ # disable analytic model. dtree only.
+ # for sot in model.states + model.transitions:
+ # for attr in model.attr_by_name[sot].values():
+ # attr.min_values_for_analytic_model = 1e6
+
static_model = model.get_static()
self.assertAlmostEqual(static_model("RX", "power"), 47964, places=0)
self.assertAlmostEqual(static_model("STANDBY1", "power"), 128, places=0)
@@ -696,13 +702,13 @@ class TestFromFile(unittest.TestCase):
param_model(
"write",
"duration",
- param=[0, 76, 1000, 0, 10, None, None, 1500, 0, None, 9, None, None],
+ param=[0, 76, 1000, 0, 10, None, None, 1500, 0, None, 9, 0, None],
),
- 1133,
+ 1090,
places=0,
)
- # only bitrate and packet length are relevant
+ # only bitrate, and arg2 are relevant
self.assertAlmostEqual(
param_model(
"write",
@@ -718,12 +724,12 @@ class TestFromFile(unittest.TestCase):
None,
None,
None,
- 9,
None,
+ 0,
None,
],
),
- 1133,
+ 1090,
places=0,
)
self.assertAlmostEqual(
@@ -741,12 +747,12 @@ class TestFromFile(unittest.TestCase):
None,
None,
None,
- 9,
None,
+ 0,
None,
],
),
- 2100,
+ 2057,
places=0,
)
self.assertAlmostEqual(
@@ -764,12 +770,12 @@ class TestFromFile(unittest.TestCase):
None,
None,
None,
- 9,
None,
+ 0,
None,
],
),
- 972,
+ 928,
places=0,
)
@@ -778,9 +784,9 @@ class TestFromFile(unittest.TestCase):
param_model(
"write",
"duration",
- param=[1, 76, 1000, 0, 10, None, None, 1500, 0, None, 9, None, None],
+ param=[1, 76, 1000, 0, 10, None, None, 1500, 0, None, 9, 1, None],
),
- 22327,
+ 22284,
places=0,
)
self.assertAlmostEqual(
@@ -798,12 +804,12 @@ class TestFromFile(unittest.TestCase):
None,
None,
None,
- 9,
None,
+ 1,
None,
],
),
- 22327,
+ 22284,
places=0,
)
self.assertAlmostEqual(
@@ -821,12 +827,12 @@ class TestFromFile(unittest.TestCase):
None,
None,
None,
- 9,
None,
+ 1,
None,
],
),
- 33273,
+ 33229,
places=0,
)
self.assertAlmostEqual(
@@ -844,12 +850,12 @@ class TestFromFile(unittest.TestCase):
None,
None,
None,
- 9,
None,
+ 1,
None,
],
),
- 20503,
+ 20459,
places=0,
)
@@ -862,6 +868,12 @@ class TestFromFile(unittest.TestCase):
self.assertEqual(
model.transitions, "setAutoAck setPALevel setRetries setup write".split(" ")
)
+
+ # disable analytic model. dtree only.
+ # for sot in model.states + model.transitions:
+ # for attr in model.attr_by_name[sot].values():
+ # attr.min_values_for_analytic_model = 1e6
+
static_model = model.get_static()
self.assertAlmostEqual(static_model("STANDBY1", "power"), 130, places=0)
self.assertAlmostEqual(static_model("setAutoAck", "power"), 150, places=0)
@@ -941,401 +953,235 @@ class TestFromFile(unittest.TestCase):
param_model(
"write",
"duration",
- param=[0, None, 1000, None, 0, None, None, 250, 0, None, 9, None, None],
- ),
- 1148,
- places=0,
- )
- self.assertAlmostEqual(
- param_model(
- "write",
- "duration",
- param=[0, None, 1000, None, 5, None, None, 250, 0, None, 9, None, None],
- ),
- 1148,
- places=0,
- )
- self.assertAlmostEqual(
- param_model(
- "write",
- "duration",
- param=[
- 0,
- None,
- 1000,
- None,
- 5,
- None,
- None,
- 2750,
- 0,
- None,
- 9,
- None,
- None,
- ],
- ),
- 1148,
- places=0,
- )
- self.assertAlmostEqual(
- param_model(
- "write",
- "duration",
- param=[
- 0,
- None,
- 1000,
- None,
- 5,
- None,
- None,
- 2750,
- 15,
- None,
- 9,
- None,
- None,
- ],
- ),
- 1148,
- places=0,
- )
-
- # auto_ack! == 1 -> max_retry_count and retry_delay affect duration, tx_power does not
- self.assertAlmostEqual(
- param_model(
- "write",
- "duration",
- param=[1, None, 1000, None, 0, None, None, 250, 0, None, 9, None, None],
+ param=[0, None, 1000, None, 0, None, None, 250, 0, None, 9, 0, None],
),
- 1473,
+ 1150,
places=0,
)
self.assertAlmostEqual(
param_model(
"write",
"duration",
- param=[
- 1,
- None,
- 1000,
- None,
- 0,
- None,
- None,
- 250,
- 12,
- None,
- 9,
- None,
- None,
- ],
+ param=[0, None, 1000, None, 0, None, None, 250, 0, None, 9, 1, None],
),
- 1473,
+ 1150,
places=0,
)
self.assertAlmostEqual(
param_model(
"write",
"duration",
- param=[1, None, 1000, None, 5, None, None, 250, 0, None, 9, None, None],
+ param=[0, None, 1000, None, 5, None, None, 250, 0, None, 9, 0, None],
),
- 5030,
+ 1150,
places=0,
)
self.assertAlmostEqual(
param_model(
"write",
"duration",
- param=[
- 1,
- None,
- 1000,
- None,
- 5,
- None,
- None,
- 250,
- 16,
- None,
- 9,
- None,
- None,
- ],
+ param=[0, None, 1000, None, 5, None, None, 250, 0, None, 9, 1, None],
),
- 5030,
+ 1150,
places=0,
)
self.assertAlmostEqual(
param_model(
"write",
"duration",
- param=[
- 1,
- None,
- 1000,
- None,
- 5,
- None,
- None,
- 2750,
- 0,
- None,
- 9,
- None,
- None,
- ],
+ param=[0, None, 1000, None, 5, None, None, 2750, 0, None, 9, 0, None],
),
- 20029,
+ 1150,
places=0,
)
self.assertAlmostEqual(
param_model(
"write",
"duration",
- param=[
- 1,
- None,
- 1000,
- None,
- 5,
- None,
- None,
- 2750,
- 15,
- None,
- 9,
- None,
- None,
- ],
+ param=[0, None, 1000, None, 5, None, None, 2750, 15, None, 9, 0, None],
),
- 20029,
+ 1150,
places=0,
)
+ # auto_ack! == 1 -> max_retry_count and retry_delay affect duration, tx_power does not
+ for tx_power in range(18):
+ self.assertAlmostEqual(
+ param_model(
+ "write",
+ "duration",
+ param=[
+ 1,
+ None,
+ 1000,
+ None,
+ 0,
+ None,
+ None,
+ 250,
+ tx_power,
+ None,
+ 9,
+ 1,
+ None,
+ ],
+ ),
+ 1418,
+ places=0,
+ )
+ for tx_power in range(18):
+ self.assertAlmostEqual(
+ param_model(
+ "write",
+ "duration",
+ param=[
+ 1,
+ None,
+ 1000,
+ None,
+ 5,
+ None,
+ None,
+ 250,
+ tx_power,
+ None,
+ 9,
+ 1,
+ None,
+ ],
+ ),
+ 4975,
+ places=0,
+ )
+ for tx_power in range(18):
+ self.assertAlmostEqual(
+ param_model(
+ "write",
+ "duration",
+ param=[
+ 1,
+ None,
+ 1000,
+ None,
+ 5,
+ None,
+ None,
+ 2750,
+ tx_power,
+ None,
+ 9,
+ 1,
+ None,
+ ],
+ ),
+ 19982,
+ places=0,
+ )
+
# auto_ack! == 0 -> max_retry_count and retry_delay have no effect on power, txpower does
- self.assertAlmostEqual(
- param_model(
- "write",
- "power",
- param=[0, None, 1000, None, 0, None, None, 250, 0, None, 9, None, None],
- ),
- 12420,
- places=0,
- )
- self.assertAlmostEqual(
- param_model(
- "write",
- "power",
- param=[
- 0,
- None,
- 1000,
- None,
- 0,
- None,
- None,
- 250,
- 12,
- None,
- 9,
- None,
- None,
- ],
- ),
- 19172,
- places=0,
- )
- self.assertAlmostEqual(
- param_model(
- "write",
- "power",
- param=[0, None, 1000, None, 5, None, None, 250, 0, None, 9, None, None],
- ),
- 12420,
- places=0,
- )
- self.assertAlmostEqual(
- param_model(
- "write",
- "power",
- param=[
- 0,
- None,
- 1000,
- None,
- 5,
- None,
- None,
- 250,
- 12,
- None,
- 9,
- None,
- None,
- ],
- ),
- 19172,
- places=0,
- )
- self.assertAlmostEqual(
- param_model(
- "write",
- "power",
- param=[
- 0,
- None,
- 1000,
- None,
- 5,
- None,
- None,
- 2750,
- 0,
- None,
- 9,
- None,
- None,
- ],
- ),
- 12420,
- places=0,
- )
- self.assertAlmostEqual(
- param_model(
- "write",
- "power",
- param=[
- 0,
- None,
- 1000,
- None,
- 5,
- None,
- None,
- 2750,
- 12,
- None,
- 9,
- None,
- None,
- ],
- ),
- 19172,
- places=0,
- )
+ for max_retry_count, retry_delay in ((0, 250), (5, 250), (5, 2750)):
+ self.assertAlmostEqual(
+ param_model(
+ "write",
+ "power",
+ param=[
+ 0,
+ None,
+ 1000,
+ None,
+ max_retry_count,
+ None,
+ None,
+ retry_delay,
+ 0,
+ None,
+ 9,
+ 0,
+ None,
+ ],
+ ),
+ 12971,
+ places=0,
+ )
+ for max_retry_count, retry_delay in ((0, 250), (5, 250), (5, 2750)):
+ self.assertAlmostEqual(
+ param_model(
+ "write",
+ "power",
+ param=[
+ 0,
+ None,
+ 1000,
+ None,
+ max_retry_count,
+ None,
+ None,
+ retry_delay,
+ 12,
+ None,
+ 9,
+ 0,
+ None,
+ ],
+ ),
+ 20029,
+ places=0,
+ )
# auto_ack! == 1 -> max_retry_count and retry_delay also affect power
self.assertAlmostEqual(
param_model(
"write",
"power",
- param=[1, None, 1000, None, 0, None, None, 250, 0, None, 9, None, None],
+ param=[1, None, 1000, None, 0, None, None, 250, 0, None, 9, 1, None],
),
- 16692,
+ 17317,
places=0,
)
self.assertAlmostEqual(
param_model(
"write",
"power",
- param=[
- 1,
- None,
- 1000,
- None,
- 0,
- None,
- None,
- 250,
- 12,
- None,
- 9,
- None,
- None,
- ],
+ param=[1, None, 1000, None, 0, None, None, 250, 12, None, 9, 1, None],
),
- 22317,
+ 23164,
places=0,
)
self.assertAlmostEqual(
param_model(
"write",
"power",
- param=[1, None, 1000, None, 5, None, None, 250, 0, None, 9, None, None],
+ param=[1, None, 1000, None, 5, None, None, 250, 0, None, 9, 1, None],
),
- 26361,
+ 26650,
places=0,
)
self.assertAlmostEqual(
param_model(
"write",
"power",
- param=[
- 1,
- None,
- 1000,
- None,
- 5,
- None,
- None,
- 250,
- 12,
- None,
- 9,
- None,
- None,
- ],
+ param=[1, None, 1000, None, 5, None, None, 250, 12, None, 9, 1, None],
),
- 35292,
+ 35680,
places=0,
)
self.assertAlmostEqual(
param_model(
"write",
"power",
- param=[
- 1,
- None,
- 1000,
- None,
- 5,
- None,
- None,
- 2750,
- 0,
- None,
- 9,
- None,
- None,
- ],
+ param=[1, None, 1000, None, 5, None, None, 2750, 0, None, 9, 1, None],
),
- 7931,
+ 8001,
places=0,
)
self.assertAlmostEqual(
param_model(
"write",
"power",
- param=[
- 1,
- None,
- 1000,
- None,
- 5,
- None,
- None,
- 2750,
- 12,
- None,
- 9,
- None,
- None,
- ],
+ param=[1, None, 1000, None, 5, None, None, 2750, 12, None, 9, 1, None],
),
- 10356,
+ 10450,
places=0,
)
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-23 17:38:10 +0000