Skip to content

Commit 9f11e73

Browse files
dweindldilpath
andauthored
Problem.add_parameter: Rename kwarg estimated->estimate (#348)
Change the `estimated` argument in Problem.add_parameter to `estimate` to match the column name. --------- Co-authored-by: Dilan Pathirana <[email protected]>
1 parent e7edebf commit 9f11e73

File tree

2 files changed

+10
-18
lines changed

2 files changed

+10
-18
lines changed

petab/v1/problem.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,8 +1074,8 @@ def add_observable(
10741074
def add_parameter(
10751075
self,
10761076
id_: str,
1077-
estimated: bool | str | int = True,
1078-
nominal_value=None,
1077+
estimate: bool | str | int = True,
1078+
nominal_value: Number | None = None,
10791079
scale: str = None,
10801080
lb: Number = None,
10811081
ub: Number = None,
@@ -1089,7 +1089,7 @@ def add_parameter(
10891089
10901090
Arguments:
10911091
id_: The parameter id
1092-
estimated: Whether the parameter is estimated
1092+
estimate: Whether the parameter is estimated
10931093
nominal_value: The nominal value of the parameter
10941094
scale: The parameter scale
10951095
lb: The lower bound of the parameter
@@ -1104,12 +1104,8 @@ def add_parameter(
11041104
record = {
11051105
PARAMETER_ID: [id_],
11061106
}
1107-
if estimated is not None:
1108-
record[ESTIMATE] = [
1109-
int(estimated)
1110-
if isinstance(estimated, bool | int)
1111-
else estimated
1112-
]
1107+
if estimate is not None:
1108+
record[ESTIMATE] = [int(estimate)]
11131109
if nominal_value is not None:
11141110
record[NOMINAL_VALUE] = [nominal_value]
11151111
if scale is not None:

petab/v2/problem.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -829,8 +829,8 @@ def add_observable(
829829
def add_parameter(
830830
self,
831831
id_: str,
832-
estimated: bool | str | int = True,
833-
nominal_value=None,
832+
estimate: bool | str | int = True,
833+
nominal_value: Number | None = None,
834834
scale: str = None,
835835
lb: Number = None,
836836
ub: Number = None,
@@ -844,7 +844,7 @@ def add_parameter(
844844
845845
Arguments:
846846
id_: The parameter id
847-
estimated: Whether the parameter is estimated
847+
estimate: Whether the parameter is estimated
848848
nominal_value: The nominal value of the parameter
849849
scale: The parameter scale
850850
lb: The lower bound of the parameter
@@ -859,12 +859,8 @@ def add_parameter(
859859
record = {
860860
PARAMETER_ID: [id_],
861861
}
862-
if estimated is not None:
863-
record[ESTIMATE] = [
864-
int(estimated)
865-
if isinstance(estimated, bool | int)
866-
else estimated
867-
]
862+
if estimate is not None:
863+
record[ESTIMATE] = [int(estimate)]
868864
if nominal_value is not None:
869865
record[NOMINAL_VALUE] = [nominal_value]
870866
if scale is not None:

0 commit comments

Comments
 (0)