diff --git a/changelog.d/+unresolved-parameter-reference.fix.md b/changelog.d/+unresolved-parameter-reference.fix.md new file mode 100644 index 00000000..18efb42d --- /dev/null +++ b/changelog.d/+unresolved-parameter-reference.fix.md @@ -0,0 +1,3 @@ +Report the referenced parameter and its target when parameter mapping cannot +resolve a value from the model or the parameter table +([#615](https://github.com/PEtab-dev/libpetab-python/pull/615)). diff --git a/petab/v1/parameter_mapping.py b/petab/v1/parameter_mapping.py index 66d0a388..1e4ed76d 100644 --- a/petab/v1/parameter_mapping.py +++ b/petab/v1/parameter_mapping.py @@ -596,8 +596,12 @@ def _apply_parameter_table( par_mapping[problem_par] = par_mapping[sim_par] scale_mapping[problem_par] = scale_mapping[sim_par] except KeyError: - if parameter_df is None: - raise + if sim_par not in parameter_df.index: + raise ValueError( + f"Cannot resolve parameter {sim_par!r} referenced by " + f"{problem_par!r}: it has no available model value " + "and is not in the parameter table." + ) from None # or the overridee is only defined in the parameter table scale = ( diff --git a/tests/v1/test_parameter_mapping.py b/tests/v1/test_parameter_mapping.py index ddb5ca99..5c3cda5d 100644 --- a/tests/v1/test_parameter_mapping.py +++ b/tests/v1/test_parameter_mapping.py @@ -3,6 +3,7 @@ import numpy as np import pandas as pd +import pytest import petab.v1 as petab from petab import ENV_NUM_THREADS @@ -693,6 +694,33 @@ def test_parameterized_condition_table_changed_scale(): assert actual == expected +@pytest.mark.parametrize("with_scales", [True, False]) +def test_mapping_rejects_unresolved_condition_reference(with_scales): + """Report which override cannot be turned into a parameter value.""" + model = SbmlModel.from_antimony( + "base = 1.5; derived = base + 1; decay = 1; " + "conc = 1; conc' = -decay * conc;" + ) + condition_df = pd.DataFrame( + {"decay": ["derived"]}, + index=pd.Index(["c1"], name=CONDITION_ID), + ) + parameter_df = pd.DataFrame( + {ESTIMATE: [1], NOMINAL_VALUE: [1.5]}, + index=pd.Index(["base"], name=PARAMETER_ID), + ) + if with_scales: + parameter_df[PARAMETER_SCALE] = LIN + + with pytest.raises(ValueError, match=r"parameter 'derived'.*'decay'"): + petab.get_optimization_to_simulation_parameter_mapping( + condition_df=condition_df, + measurement_df=pd.DataFrame({SIMULATION_CONDITION_ID: ["c1"]}), + parameter_df=parameter_df, + model=model, + ) + + def test_fill_in_nominal_values(): parameter_df = pd.DataFrame( data={