back to stable

Author: Jammy2211

autoarray/inversion/pixelization/mappers/mapper_util.py

@@ -237,6 +237,7 @@ def adaptive_rectangular_mappings_weights_via_interpolation_from(
     grid_over_sampled_scaled = (source_plane_data_grid_over_sampled - mu) / scale
     grid_over_sampled_transformed = transform(grid_over_sampled_scaled)
     grid_over_index = source_grid_size * grid_over_sampled_transformed
+    grid_over_index = (source_grid_size - 3) * grid_over_sampled_transformed + 1
 
     # --- Step 4. Floor/ceil indices ---
     ix_down = jnp.floor(grid_over_index[:, 0])

autoarray/inversion/pixelization/mesh/rectangular.py

@@ -2,6 +2,7 @@
 from typing import Optional, Tuple
 
 
+from autoarray.structures.grids.irregular_2d import Grid2DIrregular
 from autoarray.structures.grids.uniform_2d import Grid2D
 from autoarray.structures.mesh.rectangular_2d import Mesh2DRectangular
 
@@ -126,7 +127,8 @@ def mesh_grid_from(
             by overlaying the `source_plane_data_grid` with the rectangular pixelization.
         """
         return Mesh2DRectangular.overlay_grid(
-            shape_native=self.shape, grid=source_plane_data_grid.over_sampled
+            shape_native=self.shape,
+            grid=Grid2DIrregular(source_plane_data_grid.over_sampled),
         )
 
     @property

autoarray/inversion/pixelization/mesh/rectangular_uniform.py

@@ -3,6 +3,7 @@
 from typing import Optional
 
 
+from autoarray.structures.grids.irregular_2d import Grid2DIrregular
 from autoarray.structures.grids.uniform_2d import Grid2D
 from autoarray.structures.mesh.rectangular_2d_uniform import Mesh2DRectangularUniform
 
@@ -28,5 +29,6 @@ def mesh_grid_from(
             by overlaying the `source_plane_data_grid` with the rectangular pixelization.
         """
         return Mesh2DRectangularUniform.overlay_grid(
-            shape_native=self.shape, grid=source_plane_data_grid.over_sampled
+            shape_native=self.shape,
+            grid=Grid2DIrregular(source_plane_data_grid.over_sampled),
         )

autoarray/structures/grids/uniform_1d.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 import numpy as np
-import jax.numpy as jnp
 from typing import List, Union, Tuple
 
 from autoarray.structures.abstract_structure import Structure
@@ -312,8 +311,8 @@ def grid_2d_radial_projected_from(self, angle: float = 0.0) -> Grid2DIrregular:
             The projected and rotated 2D grid of (y,x) coordinates.
         """
 
-        grid = jnp.zeros((self.mask.pixels_in_mask, 2))
-        grid = grid.at[:, 1].set(self.slim.array)
+        grid = np.zeros((self.mask.pixels_in_mask, 2))
+        grid[:, 1] = self.slim.array
 
         grid = geometry_util.transform_grid_2d_to_reference_frame(
             grid_2d=grid, centre=(0.0, 0.0), angle=angle

autoarray/structures/mesh/rectangular_2d.py

@@ -89,6 +89,7 @@ def overlay_grid(
         buffer
             The size of the extra spacing placed between the edges of the rectangular pixelization and input grid.
         """
+        grid = grid.array
 
         y_min = jnp.min(grid[:, 0]) - buffer
         y_max = jnp.max(grid[:, 0]) + buffer

test_autoarray/inversion/inversion/test_inversion_util.py

@@ -81,7 +81,6 @@ def test__reconstruction_positive_negative_from():
     reconstruction = aa.util.inversion.reconstruction_positive_negative_from(
         data_vector=data_vector,
         curvature_reg_matrix=curvature_reg_matrix,
-        mapper_param_range_list=[[0, 3]],
     )
 
     assert reconstruction == pytest.approx(np.array([1.0, -1.0, 3.0]), 1.0e-4)

test_autoarray/structures/mesh/test_rectangular.py

@@ -13,7 +13,7 @@ def test__neighbors__compare_to_mesh_util():
     # I12I13I14I15I
 
     mesh = aa.Mesh2DRectangularUniform.overlay_grid(
-        shape_native=(7, 5), grid=np.zeros((2, 2)), buffer=1e-8
+        shape_native=(7, 5), grid=aa.Grid2DIrregular(np.zeros((2, 2))), buffer=1e-8
     )
 
     (neighbors_util, neighbors_sizes_util) = aa.util.mesh.rectangular_neighbors_from(
@@ -25,7 +25,7 @@ def test__neighbors__compare_to_mesh_util():
 
 
 def test__edge_pixel_list():
-    grid = np.array(
+    grid = aa.Grid2DIrregular(
         [
             [-1.0, -1.0],
             [-1.0, 0.0],
@@ -47,7 +47,7 @@ def test__edge_pixel_list():
 
 
 def test__shape_native_and_pixel_scales():
-    grid = np.array(
+    grid = aa.Grid2DIrregular(
         [
             [-1.0, -1.0],
             [-1.0, 0.0],
@@ -68,7 +68,7 @@ def test__shape_native_and_pixel_scales():
     assert mesh.shape_native == (3, 3)
     assert mesh.pixel_scales == pytest.approx((2.0 / 3.0, 2.0 / 3.0), 1e-2)
 
-    grid = np.array(
+    grid = aa.Grid2DIrregular(
         [
             [1.0, -1.0],
             [1.0, 0.0],
@@ -89,7 +89,7 @@ def test__shape_native_and_pixel_scales():
     assert mesh.shape_native == (5, 4)
     assert mesh.pixel_scales == pytest.approx((2.0 / 5.0, 2.0 / 4.0), 1e-2)
 
-    grid = np.array([[2.0, 1.0], [4.0, 3.0], [6.0, 5.0], [8.0, 7.0]])
+    grid = aa.Grid2DIrregular([[2.0, 1.0], [4.0, 3.0], [6.0, 5.0], [8.0, 7.0]])
 
     mesh = aa.Mesh2DRectangularUniform.overlay_grid(
         shape_native=(3, 3), grid=grid, buffer=1e-8
@@ -100,7 +100,7 @@ def test__shape_native_and_pixel_scales():
 
 
 def test__pixel_centres__3x3_grid__pixel_centres():
-    grid = np.array(
+    grid = aa.Grid2DIrregular(
         [
             [1.0, -1.0],
             [1.0, 0.0],
@@ -134,7 +134,7 @@ def test__pixel_centres__3x3_grid__pixel_centres():
         )
     )
 
-    grid = np.array(
+    grid = aa.Grid2DIrregular(
         [
             [1.0, -1.0],
             [1.0, 0.0],