Skip to content

Commit 911b9bd

Browse files
FlorianPfaffFlorianPfaff
authored
Merge pull request #1410 from FlorianPfaff/megalinter-fixes
[MegaLinter] Apply linters automatic fixes
2 parents ea06e41 + e7df20a commit 911b9bd

File tree

3 files changed

+170
-61
lines changed

3 files changed

+170
-61
lines changed

‎pyrecest/distributions/__init__.py‎

Lines changed: 155 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
from .abstract_bounded_domain_distribution import AbstractBoundedDomainDistribution
2-
from .abstract_bounded_nonperiodic_distribution import AbstractBoundedNonPeriodicDistribution
2+
from .abstract_bounded_nonperiodic_distribution import (
3+
AbstractBoundedNonPeriodicDistribution,
4+
)
35
from .abstract_custom_distribution import AbstractCustomDistribution
4-
from .abstract_custom_nonperiodic_distribution import AbstractCustomNonPeriodicDistribution
6+
from .abstract_custom_nonperiodic_distribution import (
7+
AbstractCustomNonPeriodicDistribution,
8+
)
59
from .abstract_dirac_distribution import AbstractDiracDistribution
610
from .abstract_disk_distribution import AbstractDiskDistribution
711
from .abstract_distribution_type import AbstractDistributionType
812
from .abstract_ellipsoidal_ball_distribution import AbstractEllipsoidalBallDistribution
913
from .abstract_grid_distribution import AbstractGridDistribution
10-
from .abstract_manifold_specific_distribution import AbstractManifoldSpecificDistribution
14+
from .abstract_manifold_specific_distribution import (
15+
AbstractManifoldSpecificDistribution,
16+
)
1117
from .abstract_mixture import AbstractMixture
1218
from .abstract_nonperiodic_distribution import AbstractNonperiodicDistribution
1319
from .abstract_orthogonal_basis_distribution import AbstractOrthogonalBasisDistribution
@@ -16,86 +22,180 @@
1622
from .abstract_se3_distribution import AbstractSE3Distribution
1723
from .abstract_uniform_distribution import AbstractUniformDistribution
1824
from .cart_prod.abstract_cart_prod_distribution import AbstractCartProdDistribution
19-
from .cart_prod.abstract_custom_lin_bounded_cart_prod_distribution import AbstractCustomLinBoundedCartProdDistribution
20-
from .cart_prod.abstract_hypercylindrical_distribution import AbstractHypercylindricalDistribution
21-
from .cart_prod.abstract_lin_bounded_cart_prod_distribution import AbstractLinBoundedCartProdDistribution
22-
from .cart_prod.abstract_lin_hemisphere_cart_prod_distribution import AbstractLinHemisphereCartProdDistribution
23-
from .cart_prod.abstract_lin_hyperhemisphere_cart_prod_distribution import AbstractLinHyperhemisphereCartProdDistribution
24-
from .cart_prod.abstract_lin_hypersphere_cart_prod_distribution import AbstractLinHypersphereCartProdDistribution
25-
from .cart_prod.abstract_lin_hypersphere_subset_cart_prod_distribution import AbstractLinHypersphereSubsetCartProdDistribution
26-
from .cart_prod.abstract_lin_periodic_cart_prod_distribution import AbstractLinPeriodicCartProdDistribution
25+
from .cart_prod.abstract_custom_lin_bounded_cart_prod_distribution import (
26+
AbstractCustomLinBoundedCartProdDistribution,
27+
)
28+
from .cart_prod.abstract_hypercylindrical_distribution import (
29+
AbstractHypercylindricalDistribution,
30+
)
31+
from .cart_prod.abstract_lin_bounded_cart_prod_distribution import (
32+
AbstractLinBoundedCartProdDistribution,
33+
)
34+
from .cart_prod.abstract_lin_hemisphere_cart_prod_distribution import (
35+
AbstractLinHemisphereCartProdDistribution,
36+
)
37+
from .cart_prod.abstract_lin_hyperhemisphere_cart_prod_distribution import (
38+
AbstractLinHyperhemisphereCartProdDistribution,
39+
)
40+
from .cart_prod.abstract_lin_hypersphere_cart_prod_distribution import (
41+
AbstractLinHypersphereCartProdDistribution,
42+
)
43+
from .cart_prod.abstract_lin_hypersphere_subset_cart_prod_distribution import (
44+
AbstractLinHypersphereSubsetCartProdDistribution,
45+
)
46+
from .cart_prod.abstract_lin_periodic_cart_prod_distribution import (
47+
AbstractLinPeriodicCartProdDistribution,
48+
)
2749
from .cart_prod.cart_prod_stacked_distribution import CartProdStackedDistribution
28-
from .cart_prod.custom_hypercylindrical_distribution import CustomHypercylindricalDistribution
29-
from .cart_prod.hypercylindrical_dirac_distribution import HypercylindricalDiracDistribution
30-
from .cart_prod.hyperhemisphere_cart_prod_dirac_distribution import HyperhemisphereCartProdDiracDistribution
31-
from .cart_prod.lin_bounded_cart_prod_dirac_distribution import LinBoundedCartProdDiracDistribution
32-
from .cart_prod.lin_hypersphere_cart_prod_dirac_distribution import LinHypersphereCartProdDiracDistribution
33-
from .cart_prod.lin_hypersphere_subset_dirac_distribution import LinHypersphereSubsetCartProdDiracDistribution
34-
from .cart_prod.lin_periodic_cart_prod_dirac_distribution import LinPeriodicCartProdDiracDistribution
35-
from .cart_prod.partially_wrapped_normal_distribution import PartiallyWrappedNormalDistribution
50+
from .cart_prod.custom_hypercylindrical_distribution import (
51+
CustomHypercylindricalDistribution,
52+
)
53+
from .cart_prod.hypercylindrical_dirac_distribution import (
54+
HypercylindricalDiracDistribution,
55+
)
56+
from .cart_prod.hyperhemisphere_cart_prod_dirac_distribution import (
57+
HyperhemisphereCartProdDiracDistribution,
58+
)
59+
from .cart_prod.lin_bounded_cart_prod_dirac_distribution import (
60+
LinBoundedCartProdDiracDistribution,
61+
)
62+
from .cart_prod.lin_hypersphere_cart_prod_dirac_distribution import (
63+
LinHypersphereCartProdDiracDistribution,
64+
)
65+
from .cart_prod.lin_hypersphere_subset_dirac_distribution import (
66+
LinHypersphereSubsetCartProdDiracDistribution,
67+
)
68+
from .cart_prod.lin_periodic_cart_prod_dirac_distribution import (
69+
LinPeriodicCartProdDiracDistribution,
70+
)
71+
from .cart_prod.partially_wrapped_normal_distribution import (
72+
PartiallyWrappedNormalDistribution,
73+
)
3674
from .circle.abstract_circular_distribution import AbstractCircularDistribution
3775
from .circle.circular_dirac_distribution import CircularDiracDistribution
3876
from .circle.circular_fourier_distribution import CircularFourierDistribution
3977
from .circle.circular_mixture import CircularMixture
4078
from .circle.circular_uniform_distribution import CircularUniformDistribution
4179
from .circle.custom_circular_distribution import CustomCircularDistribution
42-
from .circle.sine_skewed_distributions import AbstractSineSkewedDistribution
43-
from .circle.sine_skewed_distributions import GeneralizedKSineSkewedVonMisesDistribution
44-
from .circle.sine_skewed_distributions import SineSkewedVonMisesDistribution
45-
from .circle.sine_skewed_distributions import SineSkewedWrappedCauchyDistribution
46-
from .circle.sine_skewed_distributions import SineSkewedWrappedNormalDistribution
80+
from .circle.sine_skewed_distributions import (
81+
AbstractSineSkewedDistribution,
82+
GeneralizedKSineSkewedVonMisesDistribution,
83+
SineSkewedVonMisesDistribution,
84+
SineSkewedWrappedCauchyDistribution,
85+
SineSkewedWrappedNormalDistribution,
86+
)
4787
from .circle.von_mises_distribution import VonMisesDistribution
4888
from .circle.wrapped_cauchy_distribution import WrappedCauchyDistribution
4989
from .circle.wrapped_laplace_distribution import WrappedLaplaceDistribution
5090
from .circle.wrapped_normal_distribution import WrappedNormalDistribution
51-
from .conditional.abstract_conditional_distribution import AbstractConditionalDistribution
91+
from .conditional.abstract_conditional_distribution import (
92+
AbstractConditionalDistribution,
93+
)
5294
from .custom_hyperrectangular_distribution import CustomHyperrectangularDistribution
5395
from .disk_uniform_distribution import DiskUniformDistribution
5496
from .ellipsoidal_ball_uniform_distribution import EllipsoidalBallUniformDistribution
55-
from .hypersphere_subset.abstract_hemispherical_distribution import AbstractHemisphericalDistribution
56-
from .hypersphere_subset.abstract_hyperhemispherical_distribution import AbstractHyperhemisphericalDistribution
57-
from .hypersphere_subset.abstract_hypersphere_subset_dirac_distribution import AbstractHypersphereSubsetDiracDistribution
58-
from .hypersphere_subset.abstract_hypersphere_subset_distribution import AbstractHypersphereSubsetDistribution
59-
from .hypersphere_subset.abstract_hypersphere_subset_uniform_distribution import AbstractHypersphereSubsetUniformDistribution
60-
from .hypersphere_subset.abstract_hyperspherical_distribution import AbstractHypersphericalDistribution
61-
from .hypersphere_subset.abstract_sphere_subset_distribution import AbstractSphereSubsetDistribution
62-
from .hypersphere_subset.abstract_spherical_distribution import AbstractSphericalDistribution
63-
from .hypersphere_subset.abstract_spherical_harmonics_distribution import AbstractSphericalHarmonicsDistribution
97+
from .hypersphere_subset.abstract_hemispherical_distribution import (
98+
AbstractHemisphericalDistribution,
99+
)
100+
from .hypersphere_subset.abstract_hyperhemispherical_distribution import (
101+
AbstractHyperhemisphericalDistribution,
102+
)
103+
from .hypersphere_subset.abstract_hypersphere_subset_dirac_distribution import (
104+
AbstractHypersphereSubsetDiracDistribution,
105+
)
106+
from .hypersphere_subset.abstract_hypersphere_subset_distribution import (
107+
AbstractHypersphereSubsetDistribution,
108+
)
109+
from .hypersphere_subset.abstract_hypersphere_subset_uniform_distribution import (
110+
AbstractHypersphereSubsetUniformDistribution,
111+
)
112+
from .hypersphere_subset.abstract_hyperspherical_distribution import (
113+
AbstractHypersphericalDistribution,
114+
)
115+
from .hypersphere_subset.abstract_sphere_subset_distribution import (
116+
AbstractSphereSubsetDistribution,
117+
)
118+
from .hypersphere_subset.abstract_spherical_distribution import (
119+
AbstractSphericalDistribution,
120+
)
121+
from .hypersphere_subset.abstract_spherical_harmonics_distribution import (
122+
AbstractSphericalHarmonicsDistribution,
123+
)
64124
from .hypersphere_subset.bingham_distribution import BinghamDistribution
65-
from .hypersphere_subset.custom_hemispherical_distribution import CustomHemisphericalDistribution
66-
from .hypersphere_subset.custom_hyperhemispherical_distribution import CustomHyperhemisphericalDistribution
67-
from .hypersphere_subset.custom_hyperspherical_distribution import CustomHypersphericalDistribution
68-
from .hypersphere_subset.hemispherical_uniform_distribution import HemisphericalUniformDistribution
69-
from .hypersphere_subset.hyperhemispherical_bingham_distribution import HyperhemisphericalBinghamDistribution
70-
from .hypersphere_subset.hyperhemispherical_dirac_distribution import HyperhemisphericalDiracDistribution
71-
from .hypersphere_subset.hyperhemispherical_uniform_distribution import HyperhemisphericalUniformDistribution
72-
from .hypersphere_subset.hyperhemispherical_watson_distribution import HyperhemisphericalWatsonDistribution
73-
from .hypersphere_subset.hyperspherical_dirac_distribution import HypersphericalDiracDistribution
125+
from .hypersphere_subset.custom_hemispherical_distribution import (
126+
CustomHemisphericalDistribution,
127+
)
128+
from .hypersphere_subset.custom_hyperhemispherical_distribution import (
129+
CustomHyperhemisphericalDistribution,
130+
)
131+
from .hypersphere_subset.custom_hyperspherical_distribution import (
132+
CustomHypersphericalDistribution,
133+
)
134+
from .hypersphere_subset.hemispherical_uniform_distribution import (
135+
HemisphericalUniformDistribution,
136+
)
137+
from .hypersphere_subset.hyperhemispherical_bingham_distribution import (
138+
HyperhemisphericalBinghamDistribution,
139+
)
140+
from .hypersphere_subset.hyperhemispherical_dirac_distribution import (
141+
HyperhemisphericalDiracDistribution,
142+
)
143+
from .hypersphere_subset.hyperhemispherical_uniform_distribution import (
144+
HyperhemisphericalUniformDistribution,
145+
)
146+
from .hypersphere_subset.hyperhemispherical_watson_distribution import (
147+
HyperhemisphericalWatsonDistribution,
148+
)
149+
from .hypersphere_subset.hyperspherical_dirac_distribution import (
150+
HypersphericalDiracDistribution,
151+
)
74152
from .hypersphere_subset.hyperspherical_mixture import HypersphericalMixture
75-
from .hypersphere_subset.hyperspherical_uniform_distribution import HypersphericalUniformDistribution
76-
from .hypersphere_subset.spherical_harmonics_distribution_complex import SphericalHarmonicsDistributionComplex
77-
from .hypersphere_subset.spherical_harmonics_distribution_real import SphericalHarmonicsDistributionReal
153+
from .hypersphere_subset.hyperspherical_uniform_distribution import (
154+
HypersphericalUniformDistribution,
155+
)
156+
from .hypersphere_subset.spherical_harmonics_distribution_complex import (
157+
SphericalHarmonicsDistributionComplex,
158+
)
159+
from .hypersphere_subset.spherical_harmonics_distribution_real import (
160+
SphericalHarmonicsDistributionReal,
161+
)
78162
from .hypersphere_subset.von_mises_fisher_distribution import VonMisesFisherDistribution
79163
from .hypersphere_subset.watson_distribution import WatsonDistribution
80-
from .hypertorus.abstract_hypertoroidal_distribution import AbstractHypertoroidalDistribution
164+
from .hypertorus.abstract_hypertoroidal_distribution import (
165+
AbstractHypertoroidalDistribution,
166+
)
81167
from .hypertorus.abstract_toroidal_distribution import AbstractToroidalDistribution
82-
from .hypertorus.custom_hypertoroidal_distribution import CustomHypertoroidalDistribution
168+
from .hypertorus.custom_hypertoroidal_distribution import (
169+
CustomHypertoroidalDistribution,
170+
)
83171
from .hypertorus.custom_toroidal_distribution import CustomToroidalDistribution
84172
from .hypertorus.hypertoroidal_dirac_distribution import HypertoroidalDiracDistribution
85173
from .hypertorus.hypertoroidal_mixture import HypertoroidalMixture
86-
from .hypertorus.hypertoroidal_uniform_distribution import HypertoroidalUniformDistribution
87-
from .hypertorus.hypertoroidal_wrapped_normal_distribution import HypertoroidalWrappedNormalDistribution
174+
from .hypertorus.hypertoroidal_uniform_distribution import (
175+
HypertoroidalUniformDistribution,
176+
)
177+
from .hypertorus.hypertoroidal_wrapped_normal_distribution import (
178+
HypertoroidalWrappedNormalDistribution,
179+
)
88180
from .hypertorus.toroidal_dirac_distribution import ToroidalDiracDistribution
89181
from .hypertorus.toroidal_mixture import ToroidalMixture
90182
from .hypertorus.toroidal_uniform_distribution import ToroidalUniformDistribution
91-
from .hypertorus.toroidal_von_mises_sine_distribution import ToroidalVonMisesSineDistribution
92-
from .hypertorus.toroidal_wrapped_normal_distribution import ToroidalWrappedNormalDistribution
93-
from .nonperiodic.abstract_hyperrectangular_distribution import AbstractHyperrectangularDistribution
183+
from .hypertorus.toroidal_von_mises_sine_distribution import (
184+
ToroidalVonMisesSineDistribution,
185+
)
186+
from .hypertorus.toroidal_wrapped_normal_distribution import (
187+
ToroidalWrappedNormalDistribution,
188+
)
189+
from .nonperiodic.abstract_hyperrectangular_distribution import (
190+
AbstractHyperrectangularDistribution,
191+
)
94192
from .nonperiodic.abstract_linear_distribution import AbstractLinearDistribution
95193
from .nonperiodic.custom_linear_distribution import CustomLinearDistribution
96194
from .nonperiodic.gaussian_distribution import GaussianDistribution
97195
from .nonperiodic.gaussian_mixture import GaussianMixture
98-
from .nonperiodic.hyperrectangular_uniform_distribution import HyperrectangularUniformDistribution
196+
from .nonperiodic.hyperrectangular_uniform_distribution import (
197+
HyperrectangularUniformDistribution,
198+
)
99199
from .nonperiodic.linear_dirac_distribution import LinearDiracDistribution
100200
from .nonperiodic.linear_mixture import LinearMixture
101201
from .se3_cart_prod_stacked_distribution import SE3CartProdStackedDistribution
@@ -226,4 +326,4 @@
226326
"LinearMixture",
227327
"SE3CartProdStackedDistribution",
228328
"SE3DiracDistribution",
229-
]
329+
]

‎pyrecest/distributions/cart_prod/cart_prod_dirac_distribution.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
from .abstract_cart_prod_distribution import AbstractCartProdDistribution
21
from ..abstract_dirac_distribution import AbstractDiracDistribution
2+
from .abstract_cart_prod_distribution import AbstractCartProdDistribution
3+
34

4-
class CartProdDiracDistribution(AbstractDiracDistribution, AbstractCartProdDistribution):
5+
class CartProdDiracDistribution(
6+
AbstractDiracDistribution, AbstractCartProdDistribution
7+
):
58
pass

‎pyrecest/filters/abstract_particle_filter.py‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
# pylint: disable=redefined-builtin,no-name-in-module,no-member
55
# pylint: disable=no-name-in-module,no-member
6-
from pyrecest.backend import ndim, ones_like, random, sum, vmap, vstack, hstack
6+
from pyrecest.backend import hstack, ndim, ones_like, random, sum, vmap, vstack
77
from pyrecest.distributions.abstract_manifold_specific_distribution import (
88
AbstractManifoldSpecificDistribution,
99
)
@@ -16,7 +16,11 @@ def __init__(self, initial_filter_state=None):
1616
AbstractFilterType.__init__(self, initial_filter_state)
1717

1818
def predict_identity(self, noise_distribution):
19-
self.predict_nonlinear(f=lambda x: x, noise_distribution=noise_distribution, function_is_vectorized=True)
19+
self.predict_nonlinear(
20+
f=lambda x: x,
21+
noise_distribution=noise_distribution,
22+
function_is_vectorized=True,
23+
)
2024

2125
def predict_nonlinear(
2226
self,
@@ -54,8 +58,10 @@ def predict_nonlinear(
5458
updated_particles = hstack(updated_particles)
5559
else:
5660
updated_particles = vstack(updated_particles)
57-
58-
self.filter_state = self.filter_state.__class__(updated_particles, self.filter_state.w)
61+
62+
self.filter_state = self.filter_state.__class__(
63+
updated_particles, self.filter_state.w
64+
)
5965

6066
def predict_nonlinear_nonadditive(self, f, samples, weights):
6167
assert (

0 commit comments

Comments
 (0)