diff --git a/logistic.py b/logistic.py index e49d1c2..f7b16a1 100644 --- a/logistic.py +++ b/logistic.py @@ -1 +1,2 @@ -# Your code goes here +def f(x,r): + return r*x* (1-x) diff --git a/test_logistic.py b/test_logistic.py index 9391bee..ff2f6fc 100644 --- a/test_logistic.py +++ b/test_logistic.py @@ -1,6 +1,7 @@ from numpy.testing import assert_allclose from logistic import f +import pytest # Add here your test for the logistic map @@ -14,3 +15,23 @@ def test_f_corner_cases(): for x, r, expected in cases: result = f(x, r) assert_allclose(result, expected) + + +#def test_generic(): +# cases = [ +# (0.1, 2.2, 0.198), +# (0.2, 3.4, 0.544), +# (0.5, 2, 0.5), +# ] +# for x, r, expected in cases: +# result = f(x, r) +# assert_allclose(result, expected) +@pytest.mark.parametrize('x,r, expected', [ + (0.1, 2.2, 0.198), + (0.2, 3.4, 0.544), + (0.5, 2, 0.5), + ]) + +def test_generic_vals(x,r, expected): + result = f(x, r) + assert_allclose(result, expected)