Merge branch 'feature/delaunay_primitive' of https://github.com/Jammy2211/PyAutoArray into feature/delaunay_primitive

Author: Jammy2211

autoarray/inversion/pixelization/image_mesh/overlay.py

@@ -202,6 +202,8 @@ def image_plane_mesh_grid_from(
             Not used by this image mesh.
         """
 
+        print(mask.pixels_in_mask)
+
         pixel_scales = mask.pixel_scales
 
         grid = mask.derive_grid.unmasked

autoarray/inversion/regularization/regularization_util.py

@@ -309,4 +309,7 @@ def pixel_splitted_regularization_matrix_from(
     # Now scatter-add all entries into the (P,P) matrix
     reg_mat = reg_mat.at[rows, cols].add(outer_scaled)
 
+    # Divide diagonal by 2
+    reg_mat = reg_mat.at[jnp.diag_indices(reg_mat.shape[0])].add(-1e-8)
+
     return reg_mat

autoarray/plot/mat_plot/two_d.py

@@ -725,6 +725,10 @@ def _plot_delaunay_mapper(
             )
 
         else:
+
+            if hasattr(pixel_values, "array"):
+                pixel_values = pixel_values.array
+
             self.delaunay_drawer.draw_delaunay_pixels(
                 mapper=mapper,
                 pixel_values=pixel_values,

autoarray/structures/mesh/triangulation_2d.py

@@ -178,7 +178,7 @@ def split_points_from(points, area_weights, xp=np):
     """
 
     N = points.shape[0]
-    offsets = 0.5 * area_weights
+    offsets = area_weights
 
     x = points[:, 0]
     y = points[:, 1]
@@ -324,7 +324,7 @@ def delaunay(self) -> "scipy.spatial.Delaunay":
             simplices = delaunay.simplices.astype(np.int32)
             vertex_neighbor_vertices = delaunay.vertex_neighbor_vertices
 
-            voronoi_areas = voronoi_areas_from(points_np)
+            voronoi_areas = voronoi_areas_from(mesh_grid)
 
         return DelaunayInterface(
             points, simplices, voronoi_areas, vertex_neighbor_vertices