Skip to content

Commit 6f4a3a2

Browse files
Jammy2211Jammy2211
Jammy2211
authored and
Jammy2211
committed
all unit tests pass2
1 parent 2701464 commit 6f4a3a2

9 files changed

Lines changed: 41 additions & 35 deletions

File tree

‎autolens/fixtures.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def make_tracer_x2_plane_7x7():
5050

5151
def make_tracer_x2_plane_inversion_7x7():
5252
pixelization = al.Pixelization(
53-
mesh=al.mesh.Rectangular(), regularization=al.reg.Constant()
53+
mesh=al.mesh.RectangularUniform(), regularization=al.reg.Constant()
5454
)
5555

5656
source_gal_inversion = al.Galaxy(redshift=1.0, pixelization=pixelization)

‎test_autolens/analysis/analysis/test_analysis_dataset.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def test__modify_before_fit__inversion_no_positions_likelihood__raises_exception
1818
lens = al.Galaxy(redshift=0.5, mass=al.mp.IsothermalSph())
1919

2020
pixelization = al.Pixelization(
21-
mesh=al.mesh.Rectangular(), regularization=al.reg.Constant()
21+
mesh=al.mesh.RectangularUniform(), regularization=al.reg.Constant()
2222
)
2323

2424
source = al.Galaxy(redshift=1.0, pixelization=pixelization)

‎test_autolens/analysis/test_analysis.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def test__use_border_relocator__determines_if_border_pixel_relocation_is_used(
8282
masked_imaging_7x7,
8383
):
8484
pixelization = al.Pixelization(
85-
mesh=al.mesh.Rectangular(shape=(3, 3)),
85+
mesh=al.mesh.RectangularUniform(shape=(3, 3)),
8686
regularization=al.reg.Constant(coefficient=1.0),
8787
)
8888

@@ -128,7 +128,7 @@ def test__modify_before_fit__inversion_no_positions_likelihood__raises_exception
128128
lens = al.Galaxy(redshift=0.5, mass=al.mp.IsothermalSph())
129129

130130
pixelization = al.Pixelization(
131-
mesh=al.mesh.Rectangular(), regularization=al.reg.Constant()
131+
mesh=al.mesh.RectangularUniform(), regularization=al.reg.Constant()
132132
)
133133

134134
source = al.Galaxy(redshift=1.0, pixelization=pixelization)

‎test_autolens/analysis/test_result.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def test__source_plane_inversion_centre(analysis_imaging_7x7):
9393
lens = al.Galaxy(redshift=0.5, light=al.lp.SersicSph(intensity=1.0))
9494

9595
pixelization = al.Pixelization(
96-
mesh=al.mesh.Rectangular((3, 3)),
96+
mesh=al.mesh.RectangularUniform((3, 3)),
9797
regularization=al.reg.Constant(coefficient=1.0),
9898
)
9999

@@ -151,7 +151,7 @@ def test__source_plane_centre(analysis_imaging_7x7):
151151
lens = al.Galaxy(redshift=0.5, light=al.lp.SersicSph(intensity=1.0))
152152

153153
pixelization = al.Pixelization(
154-
mesh=al.mesh.Rectangular((3, 3)),
154+
mesh=al.mesh.RectangularUniform((3, 3)),
155155
regularization=al.reg.Constant(coefficient=1.0),
156156
)
157157

‎test_autolens/imaging/test_fit_imaging.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def test__fit_figure_of_merit(masked_imaging_7x7, masked_imaging_covariance_7x7)
7070
assert fit.figure_of_merit == pytest.approx(-648.4814555620, 1.0e-4)
7171

7272
pixelization = al.Pixelization(
73-
mesh=al.mesh.Rectangular(shape=(3, 3)),
73+
mesh=al.mesh.RectangularUniform(shape=(3, 3)),
7474
regularization=al.reg.Constant(coefficient=1.0),
7575
)
7676

@@ -86,7 +86,7 @@ def test__fit_figure_of_merit(masked_imaging_7x7, masked_imaging_covariance_7x7)
8686
galaxy_light = al.Galaxy(redshift=0.5, bulge=al.lp.Sersic(centre=(0.05, 0.05), intensity=1.0))
8787

8888
pixelization = al.Pixelization(
89-
mesh=al.mesh.Rectangular(shape=(3, 3)),
89+
mesh=al.mesh.RectangularUniform(shape=(3, 3)),
9090
regularization=al.reg.Constant(coefficient=1.0),
9191
)
9292

@@ -256,7 +256,7 @@ def test__fit_figure_of_merit__sub_2(image_7x7, psf_3x3, noise_map_7x7, mask_2d_
256256
assert fit.figure_of_merit == pytest.approx(-41.60614104506277, 1.0e-4)
257257

258258
pixelization = al.Pixelization(
259-
mesh=al.mesh.Rectangular(shape=(3, 3)),
259+
mesh=al.mesh.RectangularUniform(shape=(3, 3)),
260260
regularization=al.reg.Constant(coefficient=1.0),
261261
)
262262

@@ -272,7 +272,7 @@ def test__fit_figure_of_merit__sub_2(image_7x7, psf_3x3, noise_map_7x7, mask_2d_
272272
galaxy_light = al.Galaxy(redshift=0.5, bulge=al.lp.Sersic(intensity=1.0))
273273

274274
pixelization = al.Pixelization(
275-
mesh=al.mesh.Rectangular(shape=(3, 3)),
275+
mesh=al.mesh.RectangularUniform(shape=(3, 3)),
276276
regularization=al.reg.Constant(coefficient=1.0),
277277
)
278278

@@ -448,7 +448,7 @@ def test__fit__model_dataset__grid_offset__handles_special_behaviour(masked_imag
448448
)
449449

450450
pixelization = al.Pixelization(
451-
mesh=al.mesh.Rectangular(shape=(3, 3)),
451+
mesh=al.mesh.RectangularUniform(shape=(3, 3)),
452452
regularization=al.reg.Constant(coefficient=1.0),
453453
)
454454

@@ -530,7 +530,7 @@ def test__galaxy_model_image_dict(masked_imaging_7x7):
530530
)
531531

532532
pixelization = al.Pixelization(
533-
mesh=al.mesh.Rectangular(shape=(3, 3)),
533+
mesh=al.mesh.RectangularUniform(shape=(3, 3)),
534534
regularization=al.reg.Constant(coefficient=1.0),
535535
)
536536

@@ -663,7 +663,7 @@ def test__model_images_of_planes_list(masked_imaging_7x7_sub_2):
663663
g1_linear = al.Galaxy(redshift=0.75, bulge=al.lp_linear.Sersic())
664664

665665
pixelization = al.Pixelization(
666-
mesh=al.mesh.Rectangular(shape=(3, 3)),
666+
mesh=al.mesh.RectangularUniform(shape=(3, 3)),
667667
regularization=al.reg.Constant(coefficient=1.0),
668668
)
669669

@@ -806,7 +806,7 @@ def test__total_mappers(masked_imaging_7x7):
806806

807807
assert fit.total_mappers == 0
808808

809-
pixelization = al.Pixelization(mesh=al.mesh.Rectangular())
809+
pixelization = al.Pixelization(mesh=al.mesh.RectangularUniform())
810810

811811
g2 = al.Galaxy(redshift=2.0, pixelization=pixelization)
812812

‎test_autolens/imaging/test_simulate_and_fit_imaging.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def test__simulate_imaging_data_and_fit__known_likelihood():
9090
)
9191

9292
pixelization = al.Pixelization(
93-
mesh=al.mesh.Rectangular(shape=(16, 16)),
93+
mesh=al.mesh.RectangularUniform(shape=(16, 16)),
9494
regularization=al.reg.Constant(coefficient=(1.0)),
9595
)
9696

@@ -273,7 +273,7 @@ def test__simulate_imaging_data_and_fit__linear_light_profiles_and_pixelization(
273273
)
274274

275275
pixelization = al.Pixelization(
276-
mesh=al.mesh.Rectangular(shape=(3, 3)),
276+
mesh=al.mesh.RectangularUniform(shape=(3, 3)),
277277
regularization=al.reg.Constant(coefficient=0.01),
278278
)
279279

@@ -403,7 +403,7 @@ def test__simulate_imaging_data_and_fit__linear_light_profiles_and_pixelization_
403403
)
404404

405405
pixelization = al.Pixelization(
406-
mesh=al.mesh.Rectangular(shape=(3, 3)),
406+
mesh=al.mesh.RectangularUniform(shape=(3, 3)),
407407
regularization=al.reg.Constant(coefficient=0.01),
408408
)
409409

@@ -552,14 +552,14 @@ def test__simulate_imaging_data_and_fit__complex_fit_compare_mapping_matrix_w_ti
552552
)
553553

554554
pixelization = al.Pixelization(
555-
mesh=al.mesh.Rectangular(shape=(3, 3)),
555+
mesh=al.mesh.RectangularUniform(shape=(3, 3)),
556556
regularization=al.reg.Constant(coefficient=1.0),
557557
)
558558

559559
source_0 = al.Galaxy(redshift=0.4, pixelization=pixelization)
560560

561561
pixelization = al.Pixelization(
562-
mesh=al.mesh.Rectangular(shape=(3, 3)),
562+
mesh=al.mesh.RectangularUniform(shape=(3, 3)),
563563
regularization=al.reg.Constant(coefficient=1.0),
564564
)
565565

‎test_autolens/interferometer/test_fit_interferometer.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def test__fit_figure_of_merit(interferometer_7):
5757
assert fit.figure_of_merit == pytest.approx(-12779.937568696, 1.0e-4)
5858

5959
pixelization = al.Pixelization(
60-
mesh=al.mesh.Rectangular(shape=(3, 3)),
60+
mesh=al.mesh.RectangularUniform(shape=(3, 3)),
6161
regularization=al.reg.Constant(coefficient=0.01),
6262
)
6363

@@ -79,7 +79,7 @@ def test__fit_figure_of_merit(interferometer_7):
7979
)
8080

8181
pixelization = al.Pixelization(
82-
mesh=al.mesh.Rectangular(shape=(3, 3)),
82+
mesh=al.mesh.RectangularUniform(shape=(3, 3)),
8383
regularization=al.reg.Constant(coefficient=1.0),
8484
)
8585

@@ -192,7 +192,7 @@ def test___galaxy_model_image_dict(interferometer_7, interferometer_7_grid):
192192
)
193193

194194
pixelization = al.Pixelization(
195-
mesh=al.mesh.Rectangular(shape=(3, 3)),
195+
mesh=al.mesh.RectangularUniform(shape=(3, 3)),
196196
regularization=al.reg.Constant(coefficient=1.0),
197197
)
198198

@@ -316,7 +316,7 @@ def test__galaxy_model_visibilities_dict(interferometer_7, interferometer_7_grid
316316
# Pixelization + Regularizaiton only
317317

318318
pixelization = al.Pixelization(
319-
mesh=al.mesh.Rectangular(shape=(3, 3)),
319+
mesh=al.mesh.RectangularUniform(shape=(3, 3)),
320320
regularization=al.reg.Constant(coefficient=1.0),
321321
)
322322

@@ -374,7 +374,7 @@ def test__model_visibilities_of_planes_list(interferometer_7):
374374
g1_linear = al.Galaxy(redshift=0.75, bulge=al.lp_linear.Sersic())
375375

376376
pixelization = al.Pixelization(
377-
mesh=al.mesh.Rectangular(shape=(3, 3)),
377+
mesh=al.mesh.RectangularUniform(shape=(3, 3)),
378378
regularization=al.reg.Constant(coefficient=1.0),
379379
)
380380

‎test_autolens/interferometer/test_simulate_and_fit_interferometer.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def test__perfect_fit__chi_squared_0():
7878
assert fit.chi_squared == pytest.approx(0.0)
7979

8080
pixelization = al.Pixelization(
81-
mesh=al.mesh.Rectangular(shape=(7, 7)),
81+
mesh=al.mesh.RectangularUniform(shape=(7, 7)),
8282
regularization=al.reg.Constant(coefficient=0.0001),
8383
)
8484

@@ -113,7 +113,7 @@ def test__simulate_interferometer_data_and_fit__known_likelihood():
113113
grid = al.Grid2D.from_mask(mask=mask, over_sample_size=1)
114114

115115
pixelization = al.Pixelization(
116-
mesh=al.mesh.Rectangular(shape=(16, 16)),
116+
mesh=al.mesh.RectangularUniform(shape=(16, 16)),
117117
regularization=al.reg.Constant(coefficient=1.0),
118118
)
119119

@@ -290,7 +290,7 @@ def test__simulate_interferometer_data_and_fit__linear_light_profiles_and_pixeli
290290
)
291291

292292
pixelization = al.Pixelization(
293-
mesh=al.mesh.Rectangular(shape=(3, 3)),
293+
mesh=al.mesh.RectangularUniform(shape=(3, 3)),
294294
regularization=al.reg.Constant(coefficient=0.01),
295295
)
296296

‎test_autolens/lens/test_to_inversion.py‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def test__lp_linear_func_galaxy_dict_from(masked_imaging_7x7):
114114

115115

116116
def test__cls_pg_list_from(masked_imaging_7x7, grid_2d_7x7):
117-
mesh_0 = al.mesh.Rectangular(shape=(3, 3))
117+
mesh_0 = al.mesh.RectangularUniform(shape=(3, 3))
118118

119119
pixelization_0 = al.Pixelization(mesh=mesh_0)
120120

@@ -132,11 +132,11 @@ def test__cls_pg_list_from(masked_imaging_7x7, grid_2d_7x7):
132132
assert pixelization_list[0] == []
133133
assert pixelization_list[1][0].mesh.pixels == 9
134134

135-
mesh_1 = al.mesh.Rectangular(shape=(4, 3))
135+
mesh_1 = al.mesh.RectangularUniform(shape=(4, 3))
136136

137137
pixelization_1 = al.Pixelization(mesh=mesh_1)
138138

139-
mesh_2 = al.mesh.Rectangular(shape=(4, 4))
139+
mesh_2 = al.mesh.RectangularUniform(shape=(4, 4))
140140

141141
pixelization_2 = al.Pixelization(mesh=mesh_2)
142142

@@ -392,15 +392,21 @@ def test__mapper_galaxy_dict(masked_imaging_7x7):
392392

393393
galaxy_no_pix = al.Galaxy(redshift=0.5)
394394

395-
pixelization_0 = al.m.MockPixelization(mesh=al.mesh.Rectangular(shape=(3, 3)))
395+
pixelization_0 = al.m.MockPixelization(
396+
mesh=al.mesh.RectangularUniform(shape=(3, 3))
397+
)
396398

397399
galaxy_pix_0 = al.Galaxy(redshift=0.5, pixelization=pixelization_0)
398400

399-
pixelization_1 = al.m.MockPixelization(mesh=al.mesh.Rectangular(shape=(4, 3)))
401+
pixelization_1 = al.m.MockPixelization(
402+
mesh=al.mesh.RectangularUniform(shape=(4, 3))
403+
)
400404

401405
galaxy_pix_1 = al.Galaxy(redshift=1.0, pixelization=pixelization_1)
402406

403-
pixelization_2 = al.m.MockPixelization(mesh=al.mesh.Rectangular(shape=(4, 4)))
407+
pixelization_2 = al.m.MockPixelization(
408+
mesh=al.mesh.RectangularUniform(shape=(4, 4))
409+
)
404410

405411
galaxy_pix_2 = al.Galaxy(redshift=1.0, pixelization=pixelization_2)
406412

@@ -492,7 +498,7 @@ def test__inversion_imaging_from(grid_2d_7x7, masked_imaging_7x7):
492498
assert inversion.reconstruction[0] == pytest.approx(0.186868464426, 1.0e-2)
493499

494500
pixelization = al.Pixelization(
495-
mesh=al.mesh.Rectangular(shape=(3, 3)),
501+
mesh=al.mesh.RectangularUniform(shape=(3, 3)),
496502
regularization=al.reg.Constant(coefficient=0.0),
497503
)
498504

@@ -547,7 +553,7 @@ def test__inversion_interferometer_from(grid_2d_7x7, interferometer_7):
547553
assert inversion.reconstruction[0] == pytest.approx(0.0412484695, 1.0e-5)
548554

549555
pixelization = al.Pixelization(
550-
mesh=al.mesh.Rectangular(shape=(7, 7)),
556+
mesh=al.mesh.RectangularUniform(shape=(7, 7)),
551557
regularization=al.reg.Constant(coefficient=0.0),
552558
)
553559

0 commit comments

Comments
 (0)