test_autoarray/inversion/pixelization/mappers/test_factory.py -> rectanguilar mapping matrix now has interpoltion

Author: Jammy2211

autoarray/inversion/pixelization/mappers/rectangular.py

@@ -98,14 +98,18 @@ def pix_sub_weights(self) -> PixSubWeights:
         are equal to 1.0.
         """
 
-        mappings, weights = mapper_util.rectangular_mappings_weights_via_interpolation_from(
-            shape_native=self.shape_native,
-            source_plane_mesh_grid=self.source_plane_mesh_grid.array,
-            source_plane_data_grid=Grid2DIrregular(self.source_plane_data_grid.over_sampled).array,
+        mappings, weights = (
+            mapper_util.rectangular_mappings_weights_via_interpolation_from(
+                shape_native=self.shape_native,
+                source_plane_mesh_grid=self.source_plane_mesh_grid.array,
+                source_plane_data_grid=Grid2DIrregular(
+                    self.source_plane_data_grid.over_sampled
+                ).array,
+            )
         )
 
         return PixSubWeights(
             mappings=np.array(mappings),
-            sizes=4*np.ones(len(mappings), dtype="int"),
+            sizes=4 * np.ones(len(mappings), dtype="int"),
             weights=np.array(weights),
         )

test_autoarray/inversion/pixelization/mappers/test_factory.py

@@ -42,18 +42,19 @@ def test__rectangular_mapper():
         (5.0, 5.0), 1.0e-4
     )
     assert mapper.source_plane_mesh_grid.origin == pytest.approx((0.5, 0.5), 1.0e-4)
-    assert (
-        mapper.mapping_matrix
-        == np.array(
+    print(mapper.mapping_matrix)
+    assert mapper.mapping_matrix == pytest.approx(
+        np.array(
             [
-                [0.0, 0.75, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.25],
-                [0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0],
-                [0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0],
-                [0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0],
-                [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0],
+                [0.0675, 0.5775, 0.18, 0.0075, -0.065, -0.1425, 0.0, 0.0375, 0.3375],
+                [0.18, -0.03, 0.0, 0.84, -0.14, 0.0, 0.18, -0.03, 0.0],
+                [0.0225, 0.105, 0.0225, 0.105, 0.49, 0.105, 0.0225, 0.105, 0.0225],
+                [0.0, -0.03, 0.18, 0.0, -0.14, 0.84, 0.0, -0.03, 0.18],
+                [0.0, 0.0, 0.0, -0.03, -0.14, -0.03, 0.18, 0.84, 0.18],
             ]
-        )
-    ).all()
+        ),
+        1.0e-4,
+    )
     assert mapper.shape_native == (3, 3)
 
 

test_autoarray/inversion/pixelization/mappers/test_rectangular.py

@@ -31,18 +31,18 @@ def test__pix_indexes_for_sub_slim_index__matches_util():
 
     mapper = aa.Mapper(mapper_grids=mapper_grids, regularization=None)
 
-    mappings, weights = aa.util.mapper.rectangular_mappings_weights_via_interpolation_from(
-        shape_native=(3,3),
-        source_plane_mesh_grid=mesh_grid.array,
-        source_plane_data_grid=aa.Grid2DIrregular(mapper_grids.source_plane_data_grid.over_sampled).array,
+    mappings, weights = (
+        aa.util.mapper.rectangular_mappings_weights_via_interpolation_from(
+            shape_native=(3, 3),
+            source_plane_mesh_grid=mesh_grid.array,
+            source_plane_data_grid=aa.Grid2DIrregular(
+                mapper_grids.source_plane_data_grid.over_sampled
+            ).array,
+        )
     )
 
-    assert (
-        mapper.pix_sub_weights.mappings == mappings
-    ).all()
-    assert (
-        mapper.pix_sub_weights.weights == weights
-    ).all()
+    assert (mapper.pix_sub_weights.mappings == mappings).all()
+    assert (mapper.pix_sub_weights.weights == weights).all()
 
 
 def test__pixel_signals_from__matches_util(grid_2d_sub_1_7x7, image_7x7):