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
2 changes: 1 addition & 1 deletion src/simpl/simpl.py
Original file line number Diff line number Diff line change
Expand Up @@ -1893,7 +1893,7 @@ def _per_trial_initial_states(mode_l, trial_slices, is_1D_angular=False):
modes = mode_np[trial_slice]
if is_1D_angular:
angles = modes[:, 0]
mean_angle, variance = utils._circular_mean_and_variance(angles=angles, weights=None)
mean_angle, variance = utils._circular_mean_and_variance_numpy(angles)
mu = np.asarray(mean_angle)[None]
sigma = np.asarray(variance)[None, None]
else:
Expand Down
16 changes: 16 additions & 0 deletions src/simpl/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,22 @@ def _circular_mean_and_variance(
return mean, variance


def _circular_mean_and_variance_numpy(angles: np.ndarray) -> tuple[np.ndarray, np.ndarray]:
"""Compute unweighted circular moments on the host without JAX compilation."""
angles = np.asarray(angles)
sin_mean = np.mean(np.sin(angles), axis=-1)
cos_mean = np.mean(np.cos(angles), axis=-1)
mean = (np.arctan2(sin_mean, cos_mean) + np.pi) % (2 * np.pi) - np.pi

resultant_squared = sin_mean**2 + cos_mean**2
fallback = np.take(angles, 0, axis=-1)
mean = np.where(resultant_squared > 1e-12, mean, (fallback + np.pi) % (2 * np.pi) - np.pi)

residuals = (angles - np.expand_dims(mean, axis=-1) + np.pi) % (2 * np.pi) - np.pi
variance = np.mean(residuals**2, axis=-1)
return mean, variance


def _bin_indices_minuspi_pi(theta: jax.Array, n_bins: int) -> jax.Array:
"""Map theta in radians to integer bin indices [0, n_bins).

Expand Down
Loading