Linter fixes

Author: FlorianPfaff

pyrecest/evaluation/generate_measurements.py

@@ -2,7 +2,7 @@
 from beartype import beartype
 
 # pylint: disable=redefined-builtin,no-name-in-module,no-member
-from pyrecest.backend import mod, squeeze, sum, tile, zeros, pi
+from pyrecest.backend import mod, pi, squeeze, sum, tile, zeros
 from pyrecest.distributions import (
     AbstractHypertoroidalDistribution,
     GaussianDistribution,

pyrecest/filters/circular_particle_filter.py

@@ -1,7 +1,7 @@
 from typing import Union
 
 # pylint: disable=redefined-builtin,no-name-in-module,no-member
-from pyrecest.backend import float64, int32, int64, linspace, sum, pi
+from pyrecest.backend import float64, int32, int64, linspace, pi, sum
 from pyrecest.distributions import CircularDiracDistribution
 
 from .abstract_hypertoroidal_filter import AbstractHypertoroidalFilter

pyrecest/filters/gprhm_tracker.py

@@ -1,7 +1,6 @@
 # pylint: disable=redefined-builtin,no-name-in-module,no-member
 from pyrecest.backend import (
     abs,
-    pi,
     arctan2,
     array,
     cos,
@@ -13,6 +12,7 @@
     linspace,
     min,
     ndim,
+    pi,
     reshape,
     sin,
     stack,

pyrecest/filters/hypertoroidal_particle_filter.py

@@ -2,18 +2,17 @@
 from typing import Union
 
 # pylint: disable=redefined-builtin,no-name-in-module,no-member
-# pylint: disable=no-name-in-module,no-member
 from pyrecest.backend import (
     arange,
     int32,
     int64,
     linspace,
     mod,
+    pi,
     random,
     sum,
     tile,
     zeros_like,
-    pi,
 )
 from pyrecest.distributions import (
     AbstractHypertoroidalDistribution,

pyrecest/filters/random_matrix_tracker.py

@@ -4,11 +4,11 @@
     concatenate,
     cos,
     exp,
-    pi,
     eye,
     linalg,
     linspace,
     mean,
+    pi,
     sin,
 )
 from pyrecest.utils.plotting import plot_ellipsoid

pyrecest/sampling/hyperspherical_sampler.py

@@ -22,8 +22,8 @@
 )
 from pyrecest.distributions import (
     AbstractSphericalDistribution,
-    HypersphericalUniformDistribution,
     HyperhemisphericalUniformDistribution,
+    HypersphericalUniformDistribution,
 )
 
 from .abstract_sampler import AbstractSampler
@@ -53,12 +53,16 @@ def get_grid_hypersphere(method: str, grid_density_parameter: int, dim: int):
 
     return samples, grid_specific_description
 
+
 def get_grid_sphere(method: str, grid_density_parameter: int):
     return get_grid_hypersphere(method, grid_density_parameter, dim=2)
 
+
 def get_grid_hyperhemisphere(method: str, grid_density_parameter: int, dim: int):
     if method == "leopardi":
-        ls = SymmetricLeopardiSampler(original_code_column_order=True, delete_half=True, symmetry_type="plane")
+        ls = SymmetricLeopardiSampler(
+            original_code_column_order=True, delete_half=True, symmetry_type="plane"
+        )
         samples, _ = ls.get_grid(grid_density_parameter * 2, dim)
         # To have upper half along last dim instead of first
         grid_specific_description = {
@@ -70,14 +74,16 @@ def get_grid_hyperhemisphere(method: str, grid_density_parameter: int, dim: int)
 
     return samples, grid_specific_description
 
+
 class AbstractHypersphericalUniformSampler(AbstractSampler):
     def sample_stochastic(self, n_samples: int, dim: int):
         return HypersphericalUniformDistribution(dim).sample(n_samples)
 
     @abstractmethod
     def get_grid(self, grid_density_parameter, dim: int):
         raise NotImplementedError()
-    
+
+
 class AbstractHyperhemisphericalUniformSampler(AbstractSampler):
     def sample_stochastic(self, n_samples: int, dim: int):
         return HyperhemisphericalUniformDistribution(dim).sample(n_samples)
@@ -155,7 +161,9 @@ def __init__(self, original_code_column_order=True):
 
     def get_grid(self, grid_density_parameter, dim: int):
         # Use [::-1] due to different convention
-        grid_eucl = get_partition_points_cartesian(dim, grid_density_parameter, delete_half=False, symmetry_type="asymm")
+        grid_eucl = get_partition_points_cartesian(
+            dim, grid_density_parameter, delete_half=False, symmetry_type="asymm"
+        )
 
         if self.original_code_column_order:
             grid_eucl = flip(grid_eucl, axis=1)
@@ -166,18 +174,26 @@ def get_grid(self, grid_density_parameter, dim: int):
             "n_side": grid_density_parameter,
         }
         return grid_eucl, grid_specific_description
-    
+
+
 class SymmetricLeopardiSampler(AbstractHypersphericalUniformSampler):
-    def __init__(self, original_code_column_order=True, delete_half=False, symmetry_type='plane'):
+    def __init__(
+        self, original_code_column_order=True, delete_half=False, symmetry_type="plane"
+    ):
         self.original_code_column_order = original_code_column_order
         self.delete_half = delete_half
         self.symmetry_type = symmetry_type
         assert backend.__backend_name__ != "jax", "Backend unsupported"
 
     def get_grid(self, grid_density_parameter, dim: int):
         # Use [::-1] due to different convention
-        grid_eucl = get_partition_points_cartesian(dim, grid_density_parameter, delete_half=self.delete_half, symmetry_type=self.symmetry_type)
-        
+        grid_eucl = get_partition_points_cartesian(
+            dim,
+            grid_density_parameter,
+            delete_half=self.delete_half,
+            symmetry_type=self.symmetry_type,
+        )
+
         if self.original_code_column_order:
             grid_eucl = flip(grid_eucl, axis=1)
             grid_eucl[:, [0, 1]] = grid_eucl[:, [1, 0]]

pyrecest/sampling/leopardi_sampler.py

@@ -6,11 +6,14 @@
 For obtaning Cartesian coordinates, see LeopardiSampler in hyperspherical_sampler.py.
 """
 
+import copy
+
 # pylint: disable=redefined-builtin,no-name-in-module,no-member
 from pyrecest.backend import (
     abs,
     arange,
     array,
+    flip,
     int32,
     linspace,
     max,
@@ -19,14 +22,12 @@
     reshape,
     round,
     sin,
+    vstack,
     zeros,
     zeros_like,
-    flip,
-    vstack,
 )
 from scipy.optimize import root_scalar
 from scipy.special import betainc  # pylint: disable=E0611
-import copy
 
 from ..distributions import (
     AbstractHypersphereSubsetDistribution,
@@ -297,7 +298,6 @@ def get_equal_area_caps(dim, N, symmetric: bool = False):
     return cap_colatitudes, n_regions
 
 
-
 # pylint: disable=R0914
 def get_partition_points_polar(dim, N, extra_offset=False):
     """
@@ -362,7 +362,7 @@ def get_partition_points_polar_north(
         Dimension of the sphere S^dim. Currently only dim=2 is supported.
     N : int
         Total number of regions on the full sphere. Must be even.
-        
+
     Returns
     -------
     points_s : ndarray
@@ -414,6 +414,7 @@ def get_partition_points_polar_north(
 
     return points_half
 
+
 def get_partition_points_cartesian(
     dim: int,
     N: int,

pyrecest/utils/plotting.py

@@ -8,8 +8,8 @@
     linalg,
     linspace,
     ones,
-    pi,
     outer,
+    pi,
     reshape,
     sin,
     sqrt,