Skip to content

Problem.add_parameter: Rename kwarg estimated->estimate #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dweindl merged 3 commits into from
Dec 19, 2024
Merged

Problem.add_parameter: Rename kwarg estimated->estimate #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a40932
Problem.add_parameter: Rename kwarg estimated->estimate
dweindl Dec 18, 2024
54624fe
Apply suggestions from code review
dweindl Dec 19, 2024
2926214
..
dweindl Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions petab/v1/problem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1074,8 +1074,8 @@ def add_observable(
def add_parameter(
self,
id_: str,
estimated: bool | str | int = True,
nominal_value=None,
estimate: bool | str | int = True,
nominal_value: Number | None = None,
scale: str = None,
lb: Number = None,
ub: Number = None,
Expand All @@ -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
Expand All @@ -1104,12 +1104,8 @@ def add_parameter(
record = {
PARAMETER_ID: [id_],
}
if estimated is not None:
record[ESTIMATE] = [
int(estimated)
if isinstance(estimated, bool | int)
else estimated
]
if estimate is not None:
record[ESTIMATE] = [int(estimate)]
if nominal_value is not None:
record[NOMINAL_VALUE] = [nominal_value]
if scale is not None:
Expand Down
14 changes: 5 additions & 9 deletions petab/v2/problem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,8 +829,8 @@ def add_observable(
def add_parameter(
self,
id_: str,
estimated: bool | str | int = True,
nominal_value=None,
estimate: bool | str | int = True,
nominal_value: Number | None = None,
scale: str = None,
lb: Number = None,
ub: Number = None,
Expand All @@ -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
Expand All @@ -859,12 +859,8 @@ def add_parameter(
record = {
PARAMETER_ID: [id_],
}
if estimated is not None:
record[ESTIMATE] = [
int(estimated)
if isinstance(estimated, bool | int)
else estimated
]
if estimate is not None:
record[ESTIMATE] = [int(estimate)]
if nominal_value is not None:
record[NOMINAL_VALUE] = [nominal_value]
if scale is not None:
Expand Down
Loading