diff --git a/testing_project/logistic.py b/testing_project/logistic.py index 3737044..a60f6dc 100644 --- a/testing_project/logistic.py +++ b/testing_project/logistic.py @@ -11,3 +11,4 @@ def iterate_f(x, r, n_iterations): trajectory[i+1] = f(x, r) x = trajectory[i+1] return trajectory + diff --git a/testing_project/logistic_fit.py b/testing_project/logistic_fit.py index 1d38ac7..55ee1f0 100644 --- a/testing_project/logistic_fit.py +++ b/testing_project/logistic_fit.py @@ -24,7 +24,7 @@ def fit_r(xs): it = len(xs) - 1 def error(r): - return np.linalg.norm(xs - iterate_f(it, x0, r)) + return np.linalg.norm(xs - iterate_f(x0, r, it)) errors = [] for r in np.linspace(0, 4, 4001): diff --git a/testing_project/test_logistic_fit.py b/testing_project/test_logistic_fit.py new file mode 100644 index 0000000..4323c5a --- /dev/null +++ b/testing_project/test_logistic_fit.py @@ -0,0 +1,11 @@ +from numpy.testing import assert_allclose + +from logistic import iterate_f +from logistic_fit import fit_r + +def test_fit_r(): + r = 3.421 + trajectory = iterate_f(0.3, r, 23) + fit_result_r = fit_r(trajectory) + assert_allclose(r, fit_result_r) +