Adaptive grid for computation of LensingObject quantities implemented.

Author: Jammy2211

autoarray/operators/inversion/regularization.py

@@ -123,7 +123,7 @@ def __init__(self):
         """
 
 
-class instance(Regularization):
+class Constant(Regularization):
     def __init__(self, coefficient=1.0):
         """A instance-regularization scheme (regularization is described in the *Regularization* class above).
 
@@ -143,7 +143,7 @@ def __init__(self, coefficient=1.0):
             The regularization coefficient which controls the degree of smooth of the inversion reconstruction.
         """
         self.coefficient = coefficient
-        super(instance, self).__init__()
+        super(Constant, self).__init__()
 
     def regularization_weights_from_mapper(self, mapper):
         return self.coefficient * np.ones(mapper.pixelization_grid.pixels)

autoarray/structures/grids.py

@@ -506,6 +506,21 @@ def uniform(cls, shape_2d, pixel_scales=None, sub_size=1, origin=(0.0, 0.0)):
             origin=origin,
         )
 
+    @classmethod
+    def bounding_box(cls, bounding_box, shape_2d, sub_size=1):
+
+        y_max, y_min, x_max, x_min = bounding_box
+
+        pixel_scales = ((y_max - y_min) / (shape_2d[0] - 1), (x_max - x_min) / (shape_2d[1] - 1))
+        origin = ((y_max + y_min) / 2.0, (x_max + x_min) / 2.0)
+
+        return cls.uniform(
+            shape_2d=shape_2d,
+            pixel_scales=pixel_scales,
+            sub_size=sub_size,
+            origin=origin,
+        )
+
     @classmethod
     def from_mask(cls, mask):
         """Setup a sub-grid of the unmasked pixels, using a mask and a specified sub-grid size. The center of \
@@ -683,6 +698,9 @@ class IrregularMapping(object):
             def __init__(self):
                 pass
 
+            def array_from_sub_array_1d(self, sub_array_1d):
+                return sub_array_1d
+
             def grid_from_sub_grid_1d(self, sub_grid_1d):
                 return GridIrregular(grid=sub_grid_1d)
 

test_autoarray/unit/operators/inversion/test_integration.py

@@ -62,7 +62,7 @@ def test__5_simple_grid__no_sub_grid(self):
         assert mapper.shape_2d == (3, 3)
         assert (mapper.hyper_image == np.ones((2, 2))).all()
 
-        reg = aa.reg.instance(coefficient=1.0)
+        reg = aa.reg.Constant(coefficient=1.0)
         regularization_matrix = reg.regularization_matrix_from_mapper(mapper=mapper)
 
         assert (
@@ -175,7 +175,7 @@ def test__15_grid__no_sub_grid(self):
         ).all()
         assert mapper.shape_2d == (3, 3)
 
-        reg = aa.reg.instance(coefficient=1.0)
+        reg = aa.reg.Constant(coefficient=1.0)
         regularization_matrix = reg.regularization_matrix_from_mapper(mapper=mapper)
 
         assert (
@@ -287,7 +287,7 @@ def test__5_simple_grid__include_sub_grid(self):
         ).all()
         assert mapper.shape_2d == (3, 3)
 
-        reg = aa.reg.instance(coefficient=1.0)
+        reg = aa.reg.Constant(coefficient=1.0)
         regularization_matrix = reg.regularization_matrix_from_mapper(mapper=mapper)
 
         assert (
@@ -372,7 +372,7 @@ def test__grid__requires_border_relocation(self):
         ).all()
         assert mapper.shape_2d == (3, 3)
 
-        reg = aa.reg.instance(coefficient=1.0)
+        reg = aa.reg.Constant(coefficient=1.0)
         regularization_matrix = reg.regularization_matrix_from_mapper(mapper=mapper)
 
         assert (
@@ -432,7 +432,7 @@ def test__interferometer(self):
             grid=grid, sparse_grid=None, inversion_uses_border=False
         )
 
-        reg = aa.reg.instance(coefficient=0.0)
+        reg = aa.reg.Constant(coefficient=0.0)
 
         visibilities = aa.visibilities.manual_1d(
             visibilities=[
@@ -547,7 +547,7 @@ def test__3x3_simple_grid(self):
             )
         ).all()
 
-        reg = aa.reg.instance(coefficient=1.0)
+        reg = aa.reg.Constant(coefficient=1.0)
         regularization_matrix = reg.regularization_matrix_from_mapper(mapper=mapper)
 
         assert (
@@ -639,7 +639,7 @@ def test__3x3_simple_grid__include_mask(self):
             )
         ).all()
 
-        reg = aa.reg.instance(coefficient=1.0)
+        reg = aa.reg.Constant(coefficient=1.0)
         regularization_matrix = reg.regularization_matrix_from_mapper(mapper=mapper)
 
         assert (
@@ -748,7 +748,7 @@ def test__3x3_simple_grid__include_mask_and_sub_grid(self):
             )
         ).all()
 
-        reg = aa.reg.instance(coefficient=1.0)
+        reg = aa.reg.Constant(coefficient=1.0)
         regularization_matrix = reg.regularization_matrix_from_mapper(mapper=mapper)
 
         assert (
@@ -838,7 +838,7 @@ def test__3x3_simple_grid__include_mask_with_offset_centre(self):
             )
         ).all()
 
-        reg = aa.reg.instance(coefficient=1.0)
+        reg = aa.reg.Constant(coefficient=1.0)
         regularization_matrix = reg.regularization_matrix_from_mapper(mapper=mapper)
 
         assert (
@@ -896,7 +896,7 @@ def test__interferometer(self):
             grid=grid, sparse_grid=sparse_grid, inversion_uses_border=False
         )
 
-        reg = aa.reg.instance(coefficient=0.0)
+        reg = aa.reg.Constant(coefficient=0.0)
 
         visibilities = aa.visibilities.manual_1d(
             visibilities=[

test_autoarray/unit/operators/inversion/test_regularization.py

@@ -29,7 +29,7 @@ def test__regularization_matrix__compare_to_regularization_util(self):
 
         mapper = MockRegMapper(pixelization_grid=pixelization_grid)
 
-        reg = aa.reg.instance(coefficient=1.0)
+        reg = aa.reg.Constant(coefficient=1.0)
         regularization_matrix = reg.regularization_matrix_from_mapper(mapper=mapper)
 
         regularization_matrix_util = aa.util.regularization.instance_regularization_matrix_from_pixel_neighbors(

test_autoarray/unit/structures/test_grids.py

@@ -240,6 +240,31 @@ def test__grid__makes_scaled_sub_grid_with_pixel_scale_and_sub_size(self):
             assert grid.origin == (0.0, 0.0)
             assert grid.sub_size == 2
 
+    class TestGridBoundingBox:
+        def test__grid_bounding_box__uniform_box__makes_grid_with_correct_pixel_scales_and_origin(self):
+
+            grid = aa.grid.bounding_box(bounding_box=[2.0, -2.0, 2.0, -2.0], shape_2d=(3, 3))
+
+            assert (grid.in_1d == np.array([[2.0, -2.0], [2.0, 0.0], [2.0, 2.0],
+                                            [0.0, -2.0], [0.0, 0.0], [0.0, 2.0],
+                                            [-2.0, -2.0], [-2.0, 0.0], [-2.0, 2.0]])).all()
+            assert grid.pixel_scales == (2.0, 2.0)
+            assert grid.origin == (0.0, 0.0)
+
+            grid = aa.grid.bounding_box(bounding_box=[2.0, -2.0, 2.0, -2.0], shape_2d=(2, 3))
+
+            assert (grid.in_1d == np.array([[2.0, -2.0], [2.0, 0.0], [2.0, 2.0],
+                                            [-2.0, -2.0], [-2.0, 0.0], [-2.0, 2.0]])).all()
+            assert grid.pixel_scales == (4.0, 2.0)
+            assert grid.origin == (0.0, 0.0)
+
+            grid = aa.grid.bounding_box(bounding_box=[10.0, 8.0, 3.0, -2.0], shape_2d=(3, 3))
+
+            assert grid.in_1d == pytest.approx(np.array([[10.0, -2.0], [10.0, 0.5], [10.0, 3.0],
+                                            [9.0, -2.0], [9.0, 0.5], [9.0, 3.0],
+                                            [8.0, -2.0], [8.0, 0.5], [8.0, 3.0]]), 1.0e-4)
+            assert grid.pixel_scales == (1.0, 2.5)
+            assert grid.origin == (9.0, 0.5)
 
 class TestGridMaskedAPI:
     class TestManual: