Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 20 additions & 0 deletions src/pyrecest/filters/discrete_state/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,25 @@ def _validated_positive_integer(value: Any, name: str) -> int:
return parsed


def _validated_unit_interval_scalar(value: Any, name: str) -> float:
try:
raw_value = np.asarray(value)
except (TypeError, ValueError) as exc:
raise ValueError(f"{name} must be a finite real scalar in [0, 1]") from exc
if raw_value.shape != () or raw_value.dtype.kind in _REJECTED_STATE_KINDS:
raise ValueError(f"{name} must be a finite real scalar in [0, 1]")
scalar = raw_value.item()
if isinstance(scalar, _TEXT_TYPES + _BOOLEAN_TYPES + _COMPLEX_TYPES):
raise ValueError(f"{name} must be a finite real scalar in [0, 1]")
try:
parsed = float(scalar)
except (TypeError, ValueError, OverflowError) as exc:
raise ValueError(f"{name} must be a finite real scalar in [0, 1]") from exc
if not np.isfinite(parsed) or not 0.0 <= parsed <= 1.0:
raise ValueError(f"{name} must be a finite real scalar in [0, 1]")
return parsed


def _validated_probability_vector(
probabilities: Any,
n_entries: int,
Expand Down Expand Up @@ -301,6 +320,7 @@ def _validated_probability_vector(
@wraps(_original_sticky_mode_transition_matrix)
def sticky_mode_transition_matrix(n_modes, stickiness):
n_modes = _validated_positive_integer(n_modes, "n_modes")
stickiness = _validated_unit_interval_scalar(stickiness, "stickiness")
return _original_sticky_mode_transition_matrix(n_modes, stickiness)


Expand Down
38 changes: 38 additions & 0 deletions tests/filters/test_discrete_state_sticky_transition_validation.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import numpy as np
import pytest

from pyrecest.filters.discrete_state import sticky_mode_transition_matrix


@pytest.mark.parametrize(
"stickiness",
[
True,
False,
"0.5",
0.5 + 0j,
np.array([0.5]),
np.array([0.2, 0.8]),
np.nan,
np.inf,
-np.inf,
-0.1,
1.1,
],
)
def test_sticky_mode_transition_matrix_rejects_invalid_stickiness(stickiness):
with pytest.raises(ValueError, match="stickiness"):
sticky_mode_transition_matrix(3, stickiness)


@pytest.mark.parametrize(
"stickiness",
[0.0, 1.0, 0.25, np.float64(0.75), np.array(0.5)],
)
def test_sticky_mode_transition_matrix_accepts_real_scalar_stickiness(stickiness):
parsed = float(np.asarray(stickiness).item())
result = sticky_mode_transition_matrix(3, stickiness)

expected = np.full((3, 3), (1.0 - parsed) / 2.0)
np.fill_diagonal(expected, parsed)
np.testing.assert_allclose(result, expected)
Loading