From 9abd9203533fbc2294a76c413dceee53696f035b Mon Sep 17 00:00:00 2001 From: acse-dc1823 Date: Tue, 17 Oct 2023 11:07:04 +0100 Subject: [PATCH 1/3] changes --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index e715af5..11aed53 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # CI MPM Toy repo with some simple functions for the CI lecture + +Changesj made..2f \ No newline at end of file From 76e97d6c9f799901068bc9aed54ca423654a95e2 Mon Sep 17 00:00:00 2001 From: acse-dc1823 Date: Tue, 17 Oct 2023 11:17:15 +0100 Subject: [PATCH 2/3] add factorial --- simple_functions/functions1.py | 8 +++++++- tests/test_simple_functions.py | 13 ++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/simple_functions/functions1.py b/simple_functions/functions1.py index 8c63a4d..d29fe33 100644 --- a/simple_functions/functions1.py +++ b/simple_functions/functions1.py @@ -1,5 +1,6 @@ +from functools import cache -__all__ = ['my_sum'] +__all__ = ['my_sum', 'factorial'] def my_sum(iterable): @@ -7,3 +8,8 @@ def my_sum(iterable): for i in iterable: tot += i return tot + + +@cache +def factorial(n): + return n * factorial(n-1) if n else 1 diff --git a/tests/test_simple_functions.py b/tests/test_simple_functions.py index 5a03b52..7dff505 100644 --- a/tests/test_simple_functions.py +++ b/tests/test_simple_functions.py @@ -1,6 +1,6 @@ import pytest -from simple_functions import my_sum +from simple_functions import my_sum, factorial class TestSimpleFunctions(object): @@ -14,3 +14,14 @@ def test_my_add(self, iterable, expected): '''Test our add function''' isum = my_sum(iterable) assert isum == expected + + @pytest.mark.parametrize('number, expected', [ + (5, 120), + (3, 6), + (1, 1) + ]) + def test_factorial(self, number, expected): + '''Test our factorial function''' + answer = factorial(number) + assert answer == expected + From ef59dfa0118fcfb038fea19f0c927d26aa054a8b Mon Sep 17 00:00:00 2001 From: acse-dc1823 Date: Tue, 17 Oct 2023 11:22:24 +0100 Subject: [PATCH 3/3] add stupid changes --- tests/test_simple_functions.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_simple_functions.py b/tests/test_simple_functions.py index 7dff505..74a0a35 100644 --- a/tests/test_simple_functions.py +++ b/tests/test_simple_functions.py @@ -23,5 +23,6 @@ def test_my_add(self, iterable, expected): def test_factorial(self, number, expected): '''Test our factorial function''' answer = factorial(number) - assert answer == expected + #fbanassssss + assert answer==expected