From 2cdd113e23c606f9770dbd9a0740ed5df116905c Mon Sep 17 00:00:00 2001 From: "Maximilian Schmidt, blaustein" <max.schmidt@fz-juelich.de> Date: Tue, 10 Apr 2018 06:03:00 +0200 Subject: [PATCH] Update meanfield tests to integrate_siegert function names --- tests/test_meanfield.py | 2 +- tests/test_replace_cc.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/test_meanfield.py b/tests/test_meanfield.py index 3c67046..bf0a694 100644 --- a/tests/test_meanfield.py +++ b/tests/test_meanfield.py @@ -10,4 +10,4 @@ def test_meanfield(): network_params = {} theory_params = {} M0 = MultiAreaModel(network_params, theory=True, theory_spec=theory_params) - p, r0 = M0.theory.integrate_siegert() + p, r0 = M0.theory.integrate_siegert_nest() diff --git a/tests/test_replace_cc.py b/tests/test_replace_cc.py index 2b2791d..4213611 100644 --- a/tests/test_replace_cc.py +++ b/tests/test_replace_cc.py @@ -16,7 +16,7 @@ def test_het_poisson_stat_mf(): network_params = {} theory_params = {} M0 = MultiAreaModel(network_params, theory=True, theory_spec=theory_params) - p, r0 = M0.theory.integrate_siegert() + p, r0 = M0.theory.integrate_siegert_nest() rates = vector_to_dict(r0[:, -1], M0.area_list, M0.structure) with open('mf_rates.json', 'w') as f: @@ -26,7 +26,7 @@ def test_het_poisson_stat_mf(): 'replace_cc_input_source': 'mf_rates.json'}} theory_params = {} M = MultiAreaModel(network_params, theory=True, theory_spec=theory_params) - p, r = M.theory.integrate_siegert() + p, r = M.theory.integrate_siegert_nest() assert(np.allclose(r0[:, -1], r[:, -1])) @@ -35,7 +35,7 @@ def test_hom_poisson_stat_mf(): network_params = {'connection_params': {'replace_cc': 'hom_poisson_stat'}} theory_params = {} M = MultiAreaModel(network_params, theory=True, theory_spec=theory_params) - p, r = M.theory.integrate_siegert() + p, r = M.theory.integrate_siegert_nest() mu, sigma = M.theory.replace_cc_input() # Test for V1 -- GitLab