From 417e6340004f4c0fa36a1026f740174a820465f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivar=20H=C3=A4rnqvist?= <ivaha717@student.liu.se>
Date: Fri, 24 Apr 2020 18:05:02 +0200
Subject: [PATCH] remove unused dependency map from SFG, simplify dependency
tests
---
test/test_depends.py | 33 +++++++--------------------------
1 file changed, 7 insertions(+), 26 deletions(-)
diff --git a/test/test_depends.py b/test/test_depends.py
index bb8897d5..e2691105 100644
--- a/test/test_depends.py
+++ b/test/test_depends.py
@@ -3,36 +3,17 @@ from b_asic import Addition, Butterfly
class TestDepends:
def test_depends_addition(self):
add1 = Addition()
- out1_dependencies = add1.inputs_required_for_output(0)
- assert len(list(out1_dependencies)) == 2
- assert 0 in out1_dependencies
- assert 1 in out1_dependencies
+ assert set(add1.inputs_required_for_output(0)) == {0, 1}
def test_depends_butterfly(self):
bfly1 = Butterfly()
- out1_dependencies = bfly1.inputs_required_for_output(0)
- out2_dependencies = bfly1.inputs_required_for_output(1)
- assert len(list(out1_dependencies)) == 2
- assert 0 in out1_dependencies
- assert 1 in out1_dependencies
- assert len(list(out2_dependencies)) == 2
- assert 0 in out2_dependencies
- assert 1 in out2_dependencies
+ assert set(bfly1.inputs_required_for_output(0)) == {0, 1}
+ assert set(bfly1.inputs_required_for_output(1)) == {0, 1}
def test_depends_sfg(self, sfg_two_inputs_two_outputs):
- out1_dependencies = sfg_two_inputs_two_outputs.inputs_required_for_output(0)
- out2_dependencies = sfg_two_inputs_two_outputs.inputs_required_for_output(1)
- assert len(list(out1_dependencies)) == 2
- assert 0 in out1_dependencies
- assert 1 in out1_dependencies
- assert len(list(out2_dependencies)) == 2
- assert 0 in out2_dependencies
- assert 1 in out2_dependencies
+ assert set(sfg_two_inputs_two_outputs.inputs_required_for_output(0)) == {0, 1}
+ assert set(sfg_two_inputs_two_outputs.inputs_required_for_output(1)) == {0, 1}
def test_depends_sfg_independent(self, sfg_two_inputs_two_outputs_independent):
- out1_dependencies = sfg_two_inputs_two_outputs_independent.inputs_required_for_output(0)
- out2_dependencies = sfg_two_inputs_two_outputs_independent.inputs_required_for_output(1)
- assert len(list(out1_dependencies)) == 1
- assert 0 in out1_dependencies
- assert len(list(out2_dependencies)) == 1
- assert 1 in out2_dependencies
\ No newline at end of file
+ assert set(sfg_two_inputs_two_outputs_independent.inputs_required_for_output(0)) == {0}
+ assert set(sfg_two_inputs_two_outputs_independent.inputs_required_for_output(1)) == {1}
\ No newline at end of file
--
GitLab