General case testing

logistic.py

@@ -1 +1,17 @@
 # Your code goes here
+def f(x,r):
+    return r*x*(1-x)
+
+def iterate_f(x0,r,it):
+    iteration_timecourse = []
+
+    iteration_timecourse.append(x0)
+
+    x = f(x0,r)
+    iteration_timecourse.append(x)
+
+    for i in range(it-1):
+        x = f(x,r)
+        iteration_timecourse.append(x)
+
+    return iteration_timecourse 

plot_logistic.py

@@ -10,7 +10,7 @@
 from logistic import iterate_f
 
 
-def plot_trajectory(n, r, x0, fname="single_trajectory.png"):
+def plot_trajectory(x0,r,n, fname="single_trajectory.png"):
     """
     Saves a plot of a single trajectory of the logistic function
 
@@ -23,9 +23,9 @@ def plot_trajectory(n, r, x0, fname="single_trajectory.png"):
     returns
         fig, ax (matplotlib objects)
     """
-    xs = iterate_f(n, x0, r)
+    xs = iterate_f(x0, r, n)
     fig, ax = plt.subplots(figsize=(10, 5))
-    ax.plot(list(range(n)), xs)
+    ax.plot(list(range(n+1)), xs)
     fig.suptitle('Logistic Function')
 
     fig.savefig(fname)
@@ -68,3 +68,14 @@ def plot_bifurcation(start, end, step, fname="bifurcation.png", it=100000,
     ax.set_xlabel("r")
     fig.savefig(fname)
     return fig, ax
+
+
+
+
+
+x0=0.1
+r=1.5
+n=20
+
+plot_trajectory(x0, r, n)
+

test_logistic.py

@@ -1,16 +1,39 @@
 from numpy.testing import assert_allclose
+from logistic import f, iterate_f
+import pytest
+from math import isclose
+# Add here your test for the logistic map
 
-from logistic import f
+# def test_f_general():
+#     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)
+
+
+# def test_f_corner_cases():
+#     # Test cases are (x, r, expected)
+#     cases = [
+#         (0, 1.1, 0),
+#         (1, 3.7, 0),
+#     ]
+#     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),(0,1.1,0),(1,3.7,0)])
+# def test_f(x,r,expected):
+#     result = f(x,r)
+#     assert isclose(result,expected)
 
-# Add here your test for the logistic map
 
 
-def test_f_corner_cases():
-    # Test cases are (x, r, expected)
-    cases = [
-        (0, 1.1, 0),
-        (1, 3.7, 0),
-    ]
-    for x, r, expected in cases:
-        result = f(x, r)
-        assert_allclose(result, expected)
+@pytest.mark.parametrize('x,r,it,expected',[(0.1,2.2,1,[0.1,0.198]),(0.2,3.4,4,[0.2,0.544,0.843418,0.449019,0.841163]),(0.5,2,3,[0.5,0.5,0.5,0.5])])
+def test_iterate_f(x,r,it,expected):
+    result = iterate_f(x,r,it)
+    assert_allclose(result,expected,atol=0.001)