simplify API

Author: Jammy2211

autolens/fixtures.py

@@ -4,7 +4,7 @@
 
 
 def make_grid_2d_7x7():
-    return aa.Grid2D.from_mask(mask=make_mask_2d_7x7(), over_sampling_size=1)
+    return aa.Grid2D.from_mask(mask=make_mask_2d_7x7(), over_sample_size=1)
 
 
 def make_positions_x2():

autolens/imaging/simulator.py

@@ -110,13 +110,13 @@ def via_deflections_and_galaxies_from(self, deflections : aa.VectorYX2D, galaxie
         grid = aa.Grid2D.uniform(
             shape_native=deflections.shape_native,
             pixel_scales=deflections.pixel_scales,
-            over_sampling_size=1
+            over_sample_size=1
         )
 
         deflected_grid = aa.Grid2D(
             values=grid - deflections,
             mask=grid.mask,
-            over_sampling_size=1,
+            over_sample_size=1,
             over_sampled=grid - deflections
         )
 

autolens/interferometer/simulator.py

@@ -81,13 +81,13 @@ def via_deflections_and_galaxies_from(
         grid = aa.Grid2D.uniform(
             shape_native=deflections.shape_native,
             pixel_scales=deflections.pixel_scales,
-            over_sampling_size=1,
+            over_sample_size=1,
         )
 
         deflected_grid = aa.Grid2D(
             values=grid - deflections,
             mask=grid.mask,
-            over_sampling_size=1,
+            over_sample_size=1,
             over_sampled=grid - deflections,
         )
 

autolens/lens/tracer.py

@@ -285,7 +285,7 @@ def traced_grid_2d_list_from(
                     values=grid_2d_list[i],
                     mask=grid.mask,
                     over_sampled=grid_2d_over_sampled_list[i],
-                    over_sampling_size=grid.over_sampling_size,
+                    over_sample_size=grid.over_sample_size,
                 )
 
                 grid_2d_new_list.append(grid_2d_new)

test_autolens/analysis/test_preloads.py

@@ -10,7 +10,7 @@ def test__set_traced_grids_of_planes():
     grid = al.Grid2D.no_mask(
         values=np.array([[[1.0, 1.0]]]),
         pixel_scales=1.0,
-        over_sampling_size=1,
+        over_sample_size=1,
     )
 
     # traced grids is None so no Preloading.

test_autolens/imaging/test_simulate_and_fit_imaging.py

@@ -9,7 +9,7 @@
 
 def test__perfect_fit__chi_squared_0():
 
-    grid = al.Grid2D.uniform(shape_native=(11, 11), pixel_scales=0.2, over_sampling_size=1)
+    grid = al.Grid2D.uniform(shape_native=(11, 11), pixel_scales=0.2, over_sample_size=1)
 
     psf = al.Kernel2D.from_gaussian(
         shape_native=(3, 3), pixel_scales=0.2, sigma=0.75, normalize=True
@@ -123,7 +123,7 @@ def test__simulate_imaging_data_and_fit__known_likelihood():
 
 def test__simulate_imaging_data_and_fit__linear_light_profiles_agree_with_standard_light_profiles():
 
-    grid = al.Grid2D.uniform(shape_native=(11, 11), pixel_scales=0.2, over_sampling_size=1)
+    grid = al.Grid2D.uniform(shape_native=(11, 11), pixel_scales=0.2, over_sample_size=1)
 
     psf = al.Kernel2D.from_gaussian(
         shape_native=(3, 3), pixel_scales=0.2, sigma=0.75, normalize=True
@@ -232,7 +232,7 @@ def test__simulate_imaging_data_and_fit__linear_light_profiles_agree_with_standa
 
 def test__simulate_imaging_data_and_fit__linear_light_profiles_and_pixelization():
 
-    grid = al.Grid2D.uniform(shape_native=(11, 11), pixel_scales=0.2, over_sampling_size=1)
+    grid = al.Grid2D.uniform(shape_native=(11, 11), pixel_scales=0.2, over_sample_size=1)
 
     psf = al.Kernel2D.from_gaussian(
         shape_native=(3, 3), pixel_scales=0.2, sigma=0.75, normalize=True
@@ -387,7 +387,7 @@ def test__simulate_imaging_data_and_fit__linear_light_profiles_and_pixelization(
 
 def test__simulate_imaging_data_and_fit__linear_light_profiles_and_pixelization__sub_2():
 
-    grid = al.Grid2D.uniform(shape_native=(11, 11), pixel_scales=0.2, over_sampling_size=2)
+    grid = al.Grid2D.uniform(shape_native=(11, 11), pixel_scales=0.2, over_sample_size=2)
 
     psf = al.Kernel2D.from_gaussian(
         shape_native=(3, 3), pixel_scales=0.2, sigma=0.75, normalize=True
@@ -667,7 +667,7 @@ def test__simulate_imaging_data_and_fit__complex_fit_compare_mapping_matrix_w_ti
 def test__fit_figure_of_merit__mge_mass_model(masked_imaging_7x7, masked_imaging_covariance_7x7):
 
     grid = al.Grid2D.uniform(shape_native=(11, 11), pixel_scales=0.2,
-                             over_sampling_size=8)
+                             over_sample_size=8)
 
     psf = al.Kernel2D.from_gaussian(
         shape_native=(3, 3), pixel_scales=0.2, sigma=0.75, normalize=True

test_autolens/interferometer/test_simulate_and_fit_interferometer.py

@@ -9,7 +9,7 @@
 
 def test__perfect_fit__chi_squared_0():
     grid = al.Grid2D.uniform(
-        shape_native=(51, 51), pixel_scales=0.1, over_sampling_size=1
+        shape_native=(51, 51), pixel_scales=0.1, over_sample_size=1
     )
 
     lens_galaxy = al.Galaxy(
@@ -110,7 +110,7 @@ def test__perfect_fit__chi_squared_0():
 def test__simulate_interferometer_data_and_fit__known_likelihood():
     mask = al.Mask2D.circular(radius=3.0, shape_native=(31, 31), pixel_scales=0.2)
 
-    grid = al.Grid2D.from_mask(mask=mask, over_sampling_size=1)
+    grid = al.Grid2D.from_mask(mask=mask, over_sample_size=1)
 
     pixelization = al.Pixelization(
         mesh=al.mesh.Rectangular(shape=(16, 16)),
@@ -146,7 +146,7 @@ def test__simulate_interferometer_data_and_fit__known_likelihood():
 
 def test__simulate_interferometer_data_and_fit__linear_light_profiles_agree_with_standard_light_profiles():
     grid = al.Grid2D.uniform(
-        shape_native=(51, 51), pixel_scales=0.1, over_sampling_size=1
+        shape_native=(51, 51), pixel_scales=0.1, over_sample_size=1
     )
 
     lens_galaxy = al.Galaxy(
@@ -251,7 +251,7 @@ def test__simulate_interferometer_data_and_fit__linear_light_profiles_agree_with
 
 def test__simulate_interferometer_data_and_fit__linear_light_profiles_and_pixelization():
     grid = al.Grid2D.uniform(
-        shape_native=(51, 51), pixel_scales=0.1, over_sampling_size=1
+        shape_native=(51, 51), pixel_scales=0.1, over_sample_size=1
     )
 
     lens_galaxy = al.Galaxy(

test_autolens/interferometer/test_simulator.py

@@ -36,7 +36,7 @@ def test__from_tracer__same_as_tracer_input():
 
 def test__via_deflections_and_galaxies_from__same_as_calculation_using_tracer():
     grid = al.Grid2D.uniform(
-        shape_native=(20, 20), pixel_scales=0.05, over_sampling_size=1
+        shape_native=(20, 20), pixel_scales=0.05, over_sample_size=1
     )
 
     lens_galaxy = al.Galaxy(redshift=0.5, mass=al.mp.Isothermal(einstein_radius=1.6))

test_autolens/lens/test_tracer.py

@@ -257,7 +257,7 @@ def test__image_2d_from__operated_only_input(grid_2d_7x7, lp_0, lp_operated_0, m
 
 
 def test__image_2d_from__sum_of_individual_images(mask_2d_7x7):
-    grid_2d_7x7 = al.Grid2D.from_mask(mask=mask_2d_7x7, over_sampling_size=2)
+    grid_2d_7x7 = al.Grid2D.from_mask(mask=mask_2d_7x7, over_sample_size=2)
 
     g0 = al.Galaxy(
         redshift=0.1,
@@ -286,7 +286,7 @@ def test__image_2d_from__sum_of_individual_images(mask_2d_7x7):
 
 def test__image_2d_via_input_plane_image_from__with_foreground_planes(grid_2d_7x7):
     plane_grid = al.Grid2D.uniform(
-        shape_native=(40, 40), pixel_scales=0.3, over_sampling_size=1
+        shape_native=(40, 40), pixel_scales=0.3, over_sample_size=1
     )
 
     g0 = al.Galaxy(
@@ -320,7 +320,7 @@ def test__image_2d_via_input_plane_image_from__without_foreground_planes(
     grid_2d_7x7 = al.Grid2D(
         values=grid_2d_7x7,
         mask=grid_2d_7x7.mask,
-        over_sampling_size=2,
+        over_sample_size=2,
     )
 
     g0 = al.Galaxy(
@@ -356,7 +356,7 @@ def test__image_2d_via_input_plane_image_from__with_foreground_planes__multi_pla
     grid_2d_7x7,
 ):
     plane_grid = al.Grid2D.uniform(
-        shape_native=(40, 40), pixel_scales=0.3, over_sampling_size=1
+        shape_native=(40, 40), pixel_scales=0.3, over_sample_size=1
     )
 
     g0 = al.Galaxy(
@@ -462,7 +462,7 @@ def test__light_profile_snr__signal_to_noise_via_simulator_correct():
 
 
 def test__galaxy_image_2d_dict_from(grid_2d_7x7, mask_2d_7x7):
-    grid_2d_7x7 = al.Grid2D.from_mask(mask=mask_2d_7x7, over_sampling_size=2)
+    grid_2d_7x7 = al.Grid2D.from_mask(mask=mask_2d_7x7, over_sample_size=2)
 
     g0 = al.Galaxy(redshift=0.5, light_profile=al.lp.Sersic(intensity=1.0))
     g1 = al.Galaxy(