Skip to content

Changes control parameter nMCMC to int & fixes failing ruff lint#68

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
alexhroom merged 2 commits into from
Aug 16, 2024
Merged

Changes control parameter nMCMC to int & fixes failing ruff lint #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7f07a1
Changes nMCMC to int
alexhroom Aug 16, 2024
ad8a472
excludes ipynb from ruff
alexhroom Aug 16, 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
2 changes: 1 addition & 1 deletion RATapi/controls.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ class Controls(BaseModel, validate_assignment=True, extra="forbid"):
numGenerations: int = Field(500, ge=1)
# NS
nLive: int = Field(150, ge=1)
nMCMC: float = Field(0.0, ge=0.0)
nMCMC: int = Field(0, ge=0)
propScale: float = Field(0.1, gt=0.0, lt=1.0)
nsTolerance: float = Field(0.1, ge=0.0)
# Dream
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ build-backend = 'setuptools.build_meta'

[tool.ruff]
line-length = 120
extend-exclude = ["*.ipynb"]

[tool.ruff.lint]
select = ["E", "F", "UP", "B", "SIM", "I"]
Expand Down
4 changes: 2 additions & 2 deletions tests/test_controls.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -553,7 +553,7 @@ def table_str(self):
"| resampleParams | [0.9, 50] |\n"
"| display | iter |\n"
"| nLive | 150 |\n"
"| nMCMC | 0.0 |\n"
"| nMCMC | 0 |\n"
"| propScale | 0.1 |\n"
"| nsTolerance | 0.1 |\n"
"+------------------+-----------+"
Expand DownExpand Up@@ -670,7 +670,7 @@ def test_set_non_ns_properties(self, wrong_property: str, value: Any) -> None:
@pytest.mark.parametrize(
"control_property, value, bound",
[
("nMCMC", -0.6, 0),
("nMCMC", -1, 0),
("nsTolerance", -500, 0),
("nLive", -500, 1),
],
Expand Down