pure callback now starting to look readable

Author: Jammy2211

autoarray/fixtures.py

@@ -380,6 +380,7 @@ def make_delaunay_mesh_grid_9():
 
     return aa.Mesh2DDelaunay(values=grid_9)
 
+
 def make_over_sampler_2d_7x7():
     return aa.OverSampler(mask=make_mask_2d_7x7(), sub_size=2)
 
@@ -421,6 +422,7 @@ def make_delaunay_mapper_9_3x3():
         regularization=make_regularization_constant(),
     )
 
+
 def make_rectangular_inversion_7x7_3x3():
     return aa.Inversion(
         dataset=make_masked_imaging_7x7(),
@@ -434,6 +436,7 @@ def make_delaunay_inversion_9_3x3():
         linear_obj_list=[make_delaunay_mapper_9_3x3()],
     )
 
+
 ### EUCLID DATA ####
 
 

autoarray/inversion/mock/mock_mapper.py

@@ -17,7 +17,7 @@ def __init__(
         edge_pixel_list=None,
         regularization=None,
         pix_sub_weights=None,
-        pix_sub_weights_split_cross=None,
+        pix_sub_weights_split_points=None,
         mapping_matrix=None,
         pixel_signals=None,
         parameters=None,
@@ -39,7 +39,7 @@ def __init__(
         self._over_sampler = over_sampler
         self._edge_pixel_list = edge_pixel_list
         self._pix_sub_weights = pix_sub_weights
-        self._pix_sub_weights_split_cross = pix_sub_weights_split_cross
+        self._pix_sub_weights_split_points = pix_sub_weights_split_points
         self._mapping_matrix = mapping_matrix
         self._parameters = parameters
         self._pixel_signals = pixel_signals
@@ -71,8 +71,8 @@ def pix_sub_weights(self):
         return self._pix_sub_weights
 
     @property
-    def pix_sub_weights_split_cross(self):
-        return self._pix_sub_weights_split_cross
+    def pix_sub_weights_split_points(self):
+        return self._pix_sub_weights_split_points
 
     @property
     def mapping_matrix(self):

autoarray/inversion/pixelization/mappers/delaunay.py

@@ -6,9 +6,6 @@
 from autoarray.inversion.pixelization.mappers.abstract import PixSubWeights
 
 
-
-
-
 def triangle_area_xp(c0, c1, c2, xp):
     """
     Twice triangle area using vector cross product magnitude.
@@ -201,7 +198,7 @@ def pix_sub_weights(self) -> PixSubWeights:
         return PixSubWeights(mappings=mappings, sizes=sizes, weights=weights)
 
     @property
-    def pix_sub_weights_split_cross(self) -> PixSubWeights:
+    def pix_sub_weights_split_points(self) -> PixSubWeights:
         """
         The property `pix_sub_weights` property describes the calculation of the `PixSubWeights` object, which contains
         numpy arrays describing how data-points and mapper pixels map to one another and the weights of these mappings.
@@ -216,7 +213,7 @@ def pix_sub_weights_split_cross(self) -> PixSubWeights:
         delaunay = self.delaunay
 
         splitted_weights = pixel_weights_delaunay_from(
-            source_plane_data_grid=delaunay.split_cross,
+            source_plane_data_grid=delaunay.split_points,
             source_plane_mesh_grid=self.source_plane_mesh_grid.array,
             pix_indexes_for_sub_slim_index=delaunay.splitted_mappings.astype("int"),
             xp=self._xp,

autoarray/inversion/pixelization/mappers/mapper_numba_util.py

@@ -103,4 +103,3 @@ def data_slim_to_pixelization_unique_from(
         pix_lengths[ip] = pix_size
 
     return data_to_pix_unique, data_weights, pix_lengths
-

autoarray/inversion/pixelization/mesh/delaunay.py

@@ -8,6 +8,7 @@
 from autoarray.structures.grids.uniform_2d import Grid2D
 from autoarray.structures.grids.irregular_2d import Grid2DIrregular
 
+
 class Delaunay(AbstractMesh):
     def __init__(self):
         """
@@ -58,7 +59,11 @@ def mesh_grid_from(
             Settings controlling the pixelization for example if a border is used to relocate its exterior coordinates.
         """
 
-        return Mesh2DDelaunay(values=source_plane_mesh_grid, source_plane_data_grid_over_sampled=source_plane_data_grid, _xp=xp)
+        return Mesh2DDelaunay(
+            values=source_plane_mesh_grid,
+            source_plane_data_grid_over_sampled=source_plane_data_grid,
+            _xp=xp,
+        )
 
     def mapper_grids_from(
         self,
@@ -138,4 +143,4 @@ def mapper_grids_from(
             source_plane_mesh_grid=source_plane_mesh_grid,
             image_plane_mesh_grid=image_plane_mesh_grid,
             adapt_data=adapt_data,
-        )
+        )

autoarray/inversion/pixelization/mesh/mesh_numba_util.py

@@ -142,4 +142,4 @@ def voronoi_edge_pixels_from(regions: np.ndarray, point_region: np.ndarray) -> L
         if -1 in regions[i]:
             voronoi_edge_pixel_list.append(index)
 
-    return voronoi_edge_pixel_list
+    return voronoi_edge_pixel_list

autoarray/inversion/regularization/adaptive_brightness_split.py

@@ -94,16 +94,16 @@ def regularization_matrix_from(self, linear_obj: LinearObj, xp=np) -> np.ndarray
             linear_obj=linear_obj, xp=xp
         )
 
-        pix_sub_weights_split_cross = linear_obj.pix_sub_weights_split_cross
+        pix_sub_weights_split_points = linear_obj.pix_sub_weights_split_points
 
         (
             splitted_mappings,
             splitted_sizes,
             splitted_weights,
         ) = regularization_util.reg_split_from(
-            splitted_mappings=pix_sub_weights_split_cross.mappings,
-            splitted_sizes=pix_sub_weights_split_cross.sizes,
-            splitted_weights=pix_sub_weights_split_cross.weights,
+            splitted_mappings=pix_sub_weights_split_points.mappings,
+            splitted_sizes=pix_sub_weights_split_points.sizes,
+            splitted_weights=pix_sub_weights_split_points.weights,
             xp=xp,
         )
 

autoarray/inversion/regularization/adaptive_brightness_split_zeroth.py

@@ -96,16 +96,16 @@ def regularization_matrix_from(self, linear_obj: LinearObj, xp=np) -> np.ndarray
             linear_obj=linear_obj, xp=xp
         )
 
-        pix_sub_weights_split_cross = linear_obj.pix_sub_weights_split_cross
+        pix_sub_weights_split_points = linear_obj.pix_sub_weights_split_points
 
         (
             splitted_mappings,
             splitted_sizes,
             splitted_weights,
         ) = regularization_util.reg_split_from(
-            splitted_mappings=pix_sub_weights_split_cross.mappings,
-            splitted_sizes=pix_sub_weights_split_cross.sizes,
-            splitted_weights=pix_sub_weights_split_cross.weights,
+            splitted_mappings=pix_sub_weights_split_points.mappings,
+            splitted_sizes=pix_sub_weights_split_points.sizes,
+            splitted_weights=pix_sub_weights_split_points.weights,
             xp=xp,
         )
 

autoarray/inversion/regularization/constant_split.py

@@ -56,16 +56,16 @@ def regularization_matrix_from(self, linear_obj: LinearObj, xp=np) -> np.ndarray
         -------
         The regularization matrix.
         """
-        pix_sub_weights_split_cross = linear_obj.pix_sub_weights_split_cross
+        pix_sub_weights_split_points = linear_obj.pix_sub_weights_split_points
 
         (
             splitted_mappings,
             splitted_sizes,
             splitted_weights,
         ) = regularization_util.reg_split_from(
-            splitted_mappings=pix_sub_weights_split_cross.mappings,
-            splitted_sizes=pix_sub_weights_split_cross.sizes,
-            splitted_weights=pix_sub_weights_split_cross.weights,
+            splitted_mappings=pix_sub_weights_split_points.mappings,
+            splitted_sizes=pix_sub_weights_split_points.sizes,
+            splitted_weights=pix_sub_weights_split_points.weights,
             xp=xp,
         )
 

autoarray/plot/mat_plot/two_d.py

@@ -738,4 +738,3 @@ def _plot_delaunay_mapper(
                 structure=interpolation_array, auto_filename=auto_labels.filename
             )
             self.figure.close()
-