Merge pull request #260 from Jammy2211/feature/delaunay_primitive

Feature/delaunay primitive

Author: Jammy2211

autogalaxy/__init__.py

@@ -44,7 +44,6 @@
 from autoarray.structures.grids.irregular_2d import Grid2DIrregular  # noqa
 from autoarray.operators.over_sampling.over_sampler import OverSampler  # noqa
 from autoarray.structures.mesh.rectangular_2d import Mesh2DRectangular  # noqa
-from autoarray.structures.mesh.voronoi_2d import Mesh2DVoronoi  # noqa
 from autoarray.structures.mesh.delaunay_2d import Mesh2DDelaunay  # noqa
 from autoarray.structures.vectors.uniform import VectorYX2D  # noqa
 from autoarray.structures.vectors.irregular import VectorYX2DIrregular  # noqa

autogalaxy/config/priors/mesh/voronoi.yaml

@@ -471,11 +471,15 @@ def mapper_from(
             source_plane_mesh_grid=source_plane_mesh_grid,
             image_plane_mesh_grid=image_plane_mesh_grid,
             adapt_data=adapt_galaxy_image,
+            preloads=self.preloads,
             xp=self._xp,
         )
 
         return mapper_from(
-            mapper_grids=mapper_grids, regularization=regularization, xp=self._xp
+            mapper_grids=mapper_grids,
+            regularization=regularization,
+            preloads=self.preloads,
+            xp=self._xp,
         )
 
     @cached_property

autogalaxy/galaxy/to_inversion.py

@@ -30,7 +30,6 @@
     PatchOverlay,
     InterpolatedReconstruction,
     DelaunayDrawer,
-    VoronoiDrawer,
     OriginScatter,
     MaskScatter,
     BorderScatter,

autogalaxy/plot/__init__.py

@@ -31,7 +31,6 @@ def __init__(
         patch_overlay: Optional[aplt.PatchOverlay] = None,
         interpolated_reconstruction: Optional[aplt.InterpolatedReconstruction] = None,
         delaunay_drawer: Optional[aplt.DelaunayDrawer] = None,
-        voronoi_drawer: Optional[aplt.VoronoiDrawer] = None,
         origin_scatter: Optional[aplt.OriginScatter] = None,
         mask_scatter: Optional[aplt.MaskScatter] = None,
         border_scatter: Optional[aplt.BorderScatter] = None,
@@ -123,9 +122,6 @@ def __init__(
             Plots a `VectorField` object using the matplotlib function `plt.quiver`.
         patch_overlay
             Overlays matplotlib `patches.Patch` objects over the figure, such as an `Ellipse`.
-        voronoi_drawer
-            Interpolations the reconstruction of a `Mapper` object from its irregular grid (e.g. Delaunay, Voronoi) to a
-            uniform 2D array and plots it via `plt.imshow()`.
         delaunay_drawer
             Draws a colored Delaunay mesh of pixels using `plt.tripcolor`.
         voronoi_drawer
@@ -212,7 +208,6 @@ def __init__(
             grid_plot=grid_plot,
             interpolated_reconstruction=interpolated_reconstruction,
             delaunay_drawer=delaunay_drawer,
-            voronoi_drawer=voronoi_drawer,
             use_log10=use_log10,
             quick_update=quick_update,
         )

autogalaxy/plot/mat_plot/two_d.py

@@ -34,8 +34,6 @@ output:
   model_results_decimal_places: 3
   remove_files: false
   samples_to_csv: false
-pixelization:
-  voronoi_nn_max_interpolation_neighbors: 300
 structures:
   native_binned_only: false           # If True, data structures are only stored in their native and binned format. This is used to reduce memory usage in autocti.
 test:

test_autogalaxy/config/general.yaml

@@ -638,7 +638,7 @@ def test__output_to_and_load_from_json():
         light=ag.lp.Sersic(intensity=1.0),
         mass=ag.mp.Isothermal(einstein_radius=1.0),
         pixelization=ag.Pixelization(
-            mesh=ag.mesh.Voronoi(),
+            mesh=ag.mesh.Delaunay(),
             regularization=ag.reg.Constant(),
         ),
     )