Skip to content

Commit

Permalink
Add a free alias for parameters that are not fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
AndrewSazonov committed Oct 28, 2024
1 parent 6c44d07 commit fd35f29
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 2 deletions.
11 changes: 10 additions & 1 deletion src/easyscience/Objects/Variable.py
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,8 @@ def __init__(
error: Optional[Union[numbers.Number, np.ndarray]] = 0.0,
min: Optional[numbers.Number] = -np.inf,
max: Optional[numbers.Number] = np.inf,
fixed: Optional[bool] = False,
fixed: Optional[bool] = True,
free: Optional[bool] = False,
**kwargs,
):
"""
Expand Down Expand Up @@ -721,6 +722,14 @@ def fixed(self, value: bool):
raise ValueError
self._fixed = value

@property
def free(self) -> bool:
return not self.fixed

@free.setter
def free(self, value: bool) -> None:
self.fixed = not value

@property
def error(self) -> float:
"""
Expand Down
11 changes: 10 additions & 1 deletion src/easyscience/Objects/new_variable/parameter.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ def __init__(
variance: Optional[numbers.Number] = 0.0,
min: Optional[numbers.Number] = -np.inf,
max: Optional[numbers.Number] = np.inf,
fixed: Optional[bool] = False,
fixed: Optional[bool] = True,
free: Optional[bool] = False,
unique_name: Optional[str] = None,
description: Optional[str] = None,
url: Optional[str] = None,
Expand Down Expand Up @@ -301,6 +302,14 @@ def fixed(self, fixed: bool) -> None:
raise ValueError(f'{fixed=} must be a boolean. Got {type(fixed)}')
self._fixed = fixed

@property
def free(self) -> bool:
return not self.fixed

@free.setter
def free(self, value: bool) -> None:
self.fixed = not value

@property
def bounds(self) -> Tuple[numbers.Number, numbers.Number]:
"""
Expand Down

0 comments on commit fd35f29

Please sign in to comment.