From c4fd7c4ec3f5d66faf8aa02a732eecbc85328fd9 Mon Sep 17 00:00:00 2001 From: Joris Snellenburg Date: Mon, 13 Sep 2021 02:14:11 +0200 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=F0=9F=A7=B9=20Cleanup=20Thre?= =?UTF-8?q?eComponentParallel=20using=20simple=5Fgenerator?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../decay/test/test_decay_megacomplex.py | 62 +------------------ 1 file changed, 1 insertion(+), 61 deletions(-) diff --git a/glotaran/builtin/megacomplexes/decay/test/test_decay_megacomplex.py b/glotaran/builtin/megacomplexes/decay/test/test_decay_megacomplex.py index 138e08b66..41b57eb3c 100644 --- a/glotaran/builtin/megacomplexes/decay/test/test_decay_megacomplex.py +++ b/glotaran/builtin/megacomplexes/decay/test/test_decay_megacomplex.py @@ -130,70 +130,10 @@ class ThreeComponentParallel: k_matrix="parallel", ) model, initial_parameters = generator.model_and_parameters - ref_model = DecayModel.from_dict( - { - "initial_concentration": { - "j1": { - "compartments": ["s1", "s2", "s3"], - "parameters": ["inputs.1", "inputs.1", "inputs.1"], - }, - }, - "megacomplex": { - "mc1": {"k_matrix": ["k1"]}, - }, - "k_matrix": { - "k1": { - "matrix": { - ("s1", "s1"): "rates.1", - ("s2", "s2"): "rates.2", - ("s3", "s3"): "rates.3", - } - } - }, - "irf": { - "irf1": { - "type": "multi-gaussian", - "center": ["irf.center"], - "width": ["irf.width"], - }, - }, - "dataset": { - "dataset1": { - "initial_concentration": "j1", - "irf": "irf1", - "megacomplex": ["mc1"], - }, - }, - } - ) - assert str(model) == str(ref_model) - initial_parameters_ref = ParameterGroup.from_dict( - { - "rates": [ - ["1", 300e-3], - ["2", 500e-4], - ["3", 700e-5], - ], - "irf": [["center", 1.3], ["width", 7.8]], - "inputs": [["1", 1, {"vary": False}]], - } - ) - assert str(initial_parameters) == str(initial_parameters_ref) generator.rates = [301e-3, 502e-4, 705e-5] wanted_parameters = generator.parameters - wanted_parameters_ref = ParameterGroup.from_dict( - { - "rates": [ - ["1", 301e-3], - ["2", 502e-4], - ["3", 705e-5], - ], - "irf": [["center", 1.3], ["width", 7.8]], - "inputs": [["1", 1, {"vary": False}]], - } - ) - assert str(wanted_parameters) == str(wanted_parameters_ref) + time = np.arange(-10, 100, 1.5) pixel = np.arange(600, 750, 10)