diff --git a/petab/v2/core.py b/petab/v2/core.py index b72aa187..0948ea9a 100644 --- a/petab/v2/core.py +++ b/petab/v2/core.py @@ -2878,6 +2878,9 @@ def get_output_parameters( # filter out symbols that are defined in the model or mapped to # such symbols for candidate in sorted(candidates): + if candidate == C.TIME_SYMBOL: + continue + if self.model and self.model.symbol_allowed_in_observable_formula( candidate ): diff --git a/petab/v2/lint.py b/petab/v2/lint.py index 064bc888..7222af48 100644 --- a/petab/v2/lint.py +++ b/petab/v2/lint.py @@ -1052,7 +1052,8 @@ def append_overrides(overrides): # Append parameter overrides from condition table for ct in problem.condition_tables: for p in ct.free_symbols: - parameter_ids[str(p)] = None + if (str_p := str(p)) != TIME_SYMBOL: + parameter_ids[str_p] = None return set(parameter_ids.keys()) @@ -1120,7 +1121,8 @@ def append_overrides(overrides): str(p) for ct in problem.condition_tables for p in ct.free_symbols - if not problem.model.has_entity_with_id(str(p)) + if str(p) != TIME_SYMBOL + and not problem.model.has_entity_with_id(str(p)) ) # Parameters that are overridden via the condition table are not allowed diff --git a/tests/v2/test_lint.py b/tests/v2/test_lint.py index 5577d68f..df5ccc38 100644 --- a/tests/v2/test_lint.py +++ b/tests/v2/test_lint.py @@ -5,7 +5,12 @@ import pysb from petab.v2 import Problem +from petab.v2.C import TIME_SYMBOL from petab.v2.lint import * +from petab.v2.lint import ( + get_required_parameters_for_parameter_table, + get_valid_parameters_for_parameter_table, +) from petab.v2.models.pysb_model import PySBModel from petab.v2.models.sbml_model import SbmlModel @@ -185,3 +190,31 @@ def test_pysb_species_with_sites_as_condition_target( for issue in problem.validate() if issue.level >= ValidationIssueSeverity.ERROR ] + + +def test_time_in_condition_target_value_not_a_parameter(): + """`time` in condition target values is not a parameter.""" + problem = Problem() + problem.model = SbmlModel.from_antimony("species A = 1") + problem.add_experiment("e1", 0, "c1") + problem.add_condition("c1", A="time + 3") + + assert TIME_SYMBOL not in get_required_parameters_for_parameter_table( + problem + ) + assert TIME_SYMBOL not in get_valid_parameters_for_parameter_table(problem) + check = CheckAllParametersPresentInParameterTable() + assert (error := check.run(problem)) is None, error + + +def test_time_in_observable_formula_not_a_parameter(clean_pysb_exports): + """`time` in observable formulas is not a parameter, for any model type.""" + problem = Problem() + pysb_model = pysb.Model("time_model") + pysb.Parameter("k", 1) + problem.model = PySBModel(model=pysb_model, model_id="time_model") + problem.add_observable("obs1", "k * time", "time") + + assert TIME_SYMBOL not in problem.get_output_parameters() + check = CheckAllParametersPresentInParameterTable() + assert (error := check.run(problem)) is None, error