From 47f2ffc9e31b9ae858003c74076740b88a359841 Mon Sep 17 00:00:00 2001
From: Oscar Gustafsson <oscar.gustafsson@gmail.com>
Date: Mon, 20 Feb 2023 13:18:42 +0100
Subject: [PATCH] Rename critical_path to critical_path_time
---
b_asic/signal_flow_graph.py | 3 ++-
test/test_sfg.py | 4 ++--
test/test_sfg_generators.py | 22 ++++++----------------
3 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/b_asic/signal_flow_graph.py b/b_asic/signal_flow_graph.py
index 366f93cd..91831fb9 100644
--- a/b_asic/signal_flow_graph.py
+++ b/b_asic/signal_flow_graph.py
@@ -1378,7 +1378,8 @@ class SFG(AbstractOperation):
dg.format = fmt
dg.view()
- def critical_path(self):
+ def critical_path_time(self) -> int:
+ """Return the time of the critical path."""
# Import here needed to avoid circular imports
from b_asic.schedule import Schedule
diff --git a/test/test_sfg.py b/test/test_sfg.py
index 6ece1458..a40a111f 100644
--- a/test/test_sfg.py
+++ b/test/test_sfg.py
@@ -1502,10 +1502,10 @@ class TestInputDuplicationBug:
class TestCriticalPath:
def test_single_accumulator(self, sfg_simple_accumulator: SFG):
sfg_simple_accumulator.set_latency_of_type(Addition.type_name(), 5)
- assert sfg_simple_accumulator.critical_path() == 5
+ assert sfg_simple_accumulator.critical_path_time() == 5
sfg_simple_accumulator.set_latency_of_type(Addition.type_name(), 6)
- assert sfg_simple_accumulator.critical_path() == 6
+ assert sfg_simple_accumulator.critical_path_time() == 6
class TestUnfold:
diff --git a/test/test_sfg_generators.py b/test/test_sfg_generators.py
index 7b4755dc..65c1412b 100644
--- a/test/test_sfg_generators.py
+++ b/test/test_sfg_generators.py
@@ -49,20 +49,15 @@ def test_direct_form_fir():
)
== 3
)
- assert (
- len([comp for comp in sfg.components if isinstance(comp, Addition)])
- == 2
- )
- assert (
- len([comp for comp in sfg.components if isinstance(comp, Delay)]) == 2
- )
+ assert len([comp for comp in sfg.components if isinstance(comp, Addition)]) == 2
+ assert len([comp for comp in sfg.components if isinstance(comp, Delay)]) == 2
sfg = direct_form_fir(
(0.3, 0.4, 0.5, 0.6, 0.3),
mult_properties={'latency': 2, 'execution_time': 1},
add_properties={'latency': 1, 'execution_time': 1},
)
- assert sfg.critical_path() == 6
+ assert sfg.critical_path_time() == 6
def test_transposed_direct_form_fir():
@@ -77,17 +72,12 @@ def test_transposed_direct_form_fir():
)
== 3
)
- assert (
- len([comp for comp in sfg.components if isinstance(comp, Addition)])
- == 2
- )
- assert (
- len([comp for comp in sfg.components if isinstance(comp, Delay)]) == 2
- )
+ assert len([comp for comp in sfg.components if isinstance(comp, Addition)]) == 2
+ assert len([comp for comp in sfg.components if isinstance(comp, Delay)]) == 2
sfg = transposed_direct_form_fir(
(0.3, 0.4, 0.5, 0.6, 0.3),
mult_properties={'latency': 2, 'execution_time': 1},
add_properties={'latency': 1, 'execution_time': 1},
)
- assert sfg.critical_path() == 3
+ assert sfg.critical_path_time() == 3
--
GitLab