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
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from beartype import beartype

# pylint: disable=no-name-in-module,no-member
from pyrecest.backend import empty, ones, ones_like
from pyrecest.backend import hstack, ones, ones_like, zeros
from pyrecest.distributions import AbstractHypersphericalDistribution
from pyrecest.distributions.cart_prod.hyperhemisphere_cart_prod_dirac_distribution import (
HyperhemisphereCartProdDiracDistribution,
Expand Down Expand Up @@ -45,8 +45,15 @@ def __init__(
n_particles = _validate_positive_integer(n_particles, "n_particles")
dim_hemisphere = _validate_positive_integer(dim_hemisphere, "dim_hemisphere")
n_hemispheres = _validate_positive_integer(n_hemispheres, "n_hemispheres")
initial_component = hstack(
(
zeros((n_particles, dim_hemisphere)),
ones((n_particles, 1)),
)
)
initial_particles = hstack([initial_component] * n_hemispheres)
initial_filter_state = HyperhemisphereCartProdDiracDistribution(
empty((n_particles, (dim_hemisphere + 1) * n_hemispheres)),
initial_particles,
ones(n_particles) / n_particles,
dim_hemisphere,
n_hemispheres,
Expand Down
7 changes: 4 additions & 3 deletions src/pyrecest/filters/hyperhemispherical_particle_filter.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from numbers import Integral

from pyrecest.backend import empty
from pyrecest.backend import hstack, ones, zeros
from pyrecest.distributions.hypersphere_subset.abstract_hyperhemispherical_distribution import (
AbstractHyperhemisphericalDistribution,
)
Expand Down Expand Up @@ -34,9 +34,10 @@ def __init__(self, n_particles: int, dim: int) -> None:
"""
n_particles = _validate_positive_integer(n_particles, "n_particles")
dim = _validate_positive_integer(dim, "dim")
initial_filter_state = HyperhemisphericalDiracDistribution(
empty((n_particles, dim + 1))
initial_particles = hstack(
(zeros((n_particles, dim)), ones((n_particles, 1)))
)
initial_filter_state = HyperhemisphericalDiracDistribution(initial_particles)
HyperhemisphericalFilterMixin.__init__(self)
AbstractParticleFilter.__init__(self, initial_filter_state=initial_filter_state)

Expand Down
12 changes: 12 additions & 0 deletions tests/filters/test_hyperhemisphere_cart_prod_particle_filter.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@
import pyrecest.backend # pylint: disable=no-name-in-module,no-member
from pyrecest.backend import ( # pylint: disable=no-name-in-module,no-member,redefined-builtin
abs,
allclose,
array,
hstack,
ones,
sum,
zeros,
)
from pyrecest.distributions import VonMisesFisherDistribution
from pyrecest.distributions.cart_prod.hyperhemisphere_cart_prod_dirac_distribution import (
Expand All @@ -27,6 +31,14 @@ def test_init(self):
pf.filter_state.d.shape,
(n_particles, (dim_hemisphere + 1) * n_hemispheres),
)
expected_component = hstack(
(
zeros((n_particles, dim_hemisphere)),
ones((n_particles, 1)),
)
)
expected_particles = hstack([expected_component] * n_hemispheres)
self.assertTrue(bool(allclose(pf.filter_state.d, expected_particles)))

def test_constructor_rejects_invalid_particle_count(self):
for n_particles in (True, 0, -1, 1.5):
Expand Down
9 changes: 8 additions & 1 deletion tests/filters/test_hyperhemispherical_particle_filter.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import pyrecest.backend

# pylint: disable=redefined-builtin,no-name-in-module,no-member
from pyrecest.backend import array, linalg, random
from pyrecest.backend import allclose, array, hstack, linalg, ones, random, zeros
from pyrecest.distributions import HyperhemisphericalWatsonDistribution
from pyrecest.distributions.hypersphere_subset.hyperhemispherical_dirac_distribution import (
HyperhemisphericalDiracDistribution,
Expand Down Expand Up @@ -32,6 +32,13 @@ def test_initialization(self):
hpf = HyperhemisphericalParticleFilter(self.n_particles, 3)
self.assertEqual(hpf.filter_state.w.shape, (self.n_particles,))
self.assertEqual(hpf.filter_state.d.shape, (self.n_particles, 4))
expected_particles = hstack(
(
zeros((self.n_particles, 3)),
ones((self.n_particles, 1)),
)
)
self.assertTrue(bool(allclose(hpf.filter_state.d, expected_particles)))

def test_constructor_rejects_invalid_particle_count(self):
for n_particles in (True, 0, -1, 1.5):
Expand Down
Loading