From 70d3bfe4d653cd63b537a2ea456784c9044c7b8c Mon Sep 17 00:00:00 2001 From: Daniel Weindl Date: Wed, 18 Dec 2024 23:15:02 +0100 Subject: [PATCH] Problem.add_parameter: Rename kwarg estimated->estimate Change the `estimated` argument in Problem.add_parameter to `estimate` to match the column name. --- petab/v1/problem.py | 10 ++++------ petab/v2/problem.py | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/petab/v1/problem.py b/petab/v1/problem.py index 6be96c68..972fe5b8 100644 --- a/petab/v1/problem.py +++ b/petab/v1/problem.py @@ -1074,7 +1074,7 @@ def add_observable( def add_parameter( self, id_: str, - estimated: bool | str | int = True, + estimate: bool | str | int = True, nominal_value=None, scale: str = None, lb: Number = None, @@ -1089,7 +1089,7 @@ def add_parameter( Arguments: id_: The parameter id - estimated: Whether the parameter is estimated + estimate: Whether the parameter is estimated nominal_value: The nominal value of the parameter scale: The parameter scale lb: The lower bound of the parameter @@ -1104,11 +1104,9 @@ def add_parameter( record = { PARAMETER_ID: [id_], } - if estimated is not None: + if estimate is not None: record[ESTIMATE] = [ - int(estimated) - if isinstance(estimated, bool | int) - else estimated + int(estimate) if isinstance(estimate, bool | int) else estimate ] if nominal_value is not None: record[NOMINAL_VALUE] = [nominal_value] diff --git a/petab/v2/problem.py b/petab/v2/problem.py index f8dad754..bf569c24 100644 --- a/petab/v2/problem.py +++ b/petab/v2/problem.py @@ -829,7 +829,7 @@ def add_observable( def add_parameter( self, id_: str, - estimated: bool | str | int = True, + estimate: bool | str | int = True, nominal_value=None, scale: str = None, lb: Number = None, @@ -844,7 +844,7 @@ def add_parameter( Arguments: id_: The parameter id - estimated: Whether the parameter is estimated + estimate: Whether the parameter is estimated nominal_value: The nominal value of the parameter scale: The parameter scale lb: The lower bound of the parameter @@ -859,11 +859,9 @@ def add_parameter( record = { PARAMETER_ID: [id_], } - if estimated is not None: + if estimate is not None: record[ESTIMATE] = [ - int(estimated) - if isinstance(estimated, bool | int) - else estimated + int(estimate) if isinstance(estimate, bool | int) else estimate ] if nominal_value is not None: record[NOMINAL_VALUE] = [nominal_value]