diff --git a/src/main/py/logical_operations.py b/src/main/py/logical_operations.py index 7248048..6b3b78a 100644 --- a/src/main/py/logical_operations.py +++ b/src/main/py/logical_operations.py @@ -1,4 +1,4 @@ -def identity_disconjunctive(first_input, operator, second_input): +def identity_disconjunctive(first_input, second_input): if first_input == 1 and second_input == 1: return None elif first_input == 0 and second_input == 0: @@ -7,10 +7,17 @@ def identity_disconjunctive(first_input, operator, second_input): return 1 -def identity_conjunctive(first_input, operator, second_input): +def identity_conjunctive(first_input, second_input): if first_input == 1 and second_input == 1: return 1 elif first_input == 0 and second_input == 0: return None else: return 0 + + +def identity(first_input, operator, second_input): + if operator == "+": + return identity_disconjunctive(first_input, second_input) + else: + return identity_conjunctive(first_input, second_input) diff --git a/src/test/py/test_logical_operations.py b/src/test/py/test_logical_operations.py index a8c0994..87f3e17 100644 --- a/src/test/py/test_logical_operations.py +++ b/src/test/py/test_logical_operations.py @@ -10,28 +10,28 @@ class calculationsWithRoots(unittest.TestCase): pass def test_disconjunctive_identity_1_or_0_equals_x(self): - self.assertEqual(identity_disconjunctive(1, "+", 0), 1) + self.assertEqual(identity(1, "+", 0), 1) def test_disconjunctive_identity_1_or_1_equals_None(self): - self.assertEqual(identity_disconjunctive(1, "+", 1), None) + self.assertEqual(identity(1, "+", 1), None) def test_disconjunctive_identity_0_or_1_equals_None(self): - self.assertEqual(identity_disconjunctive(0, "+", 1), 1) + self.assertEqual(identity(0, "+", 1), 1) def test_disconjunctive_identity_0_or_0_equals_0(self): - self.assertEqual(identity_disconjunctive(0, "+", 0), 0) + self.assertEqual(identity(0, "+", 0), 0) def test_conjunctive_identity_0_and_0_equals_None(self): - self.assertEqual(identity_conjunctive(0, ".", 0), None) + self.assertEqual(identity(0, ".", 0), None) def test_conjunctive_identity_1_and_0_equals_None(self): - self.assertEqual(identity_conjunctive(1, ".", 0), 0) + self.assertEqual(identity(1, ".", 0), 0) def test_conjunctive_identity_0_and_1_equals_0(self): - self.assertEqual(identity_conjunctive(0, ".", 1), 0) + self.assertEqual(identity(0, ".", 1), 0) def test_conjunctive_identity_1_and_1_equals_1(self): - self.assertEqual(identity_conjunctive(1, ".", 1), 1) + self.assertEqual(identity(1, ".", 1), 1) if __name__ == "__main__":