Skip to content

Commit 61f6cd3

Browse files
Jammy2211Jammy2211
authored andcommitted
all tests updated
1 parent dd748d4 commit 61f6cd3

2 files changed

Lines changed: 19 additions & 19 deletions

File tree

test_autogalaxy/imaging/test_fit_imaging.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def test__fit_figure_of_merit(
6666
)
6767

6868
assert fit.perform_inversion is True
69-
assert fit.figure_of_merit == pytest.approx(-22.9005, 1.0e-4)
69+
assert fit.figure_of_merit == pytest.approx(-22.91411868616, 1.0e-4)
7070

7171
galaxy_light = ag.Galaxy(
7272
redshift=0.5, bulge=ag.lp.Sersic(intensity=1.0, centre=(0.05, 0.05))
@@ -75,7 +75,7 @@ def test__fit_figure_of_merit(
7575
fit = ag.FitImaging(dataset=masked_imaging_7x7, galaxies=[galaxy_light, galaxy_pix])
7676

7777
assert fit.perform_inversion is True
78-
assert fit.figure_of_merit == pytest.approx(-29.201919365, 1.0e-4)
78+
assert fit.figure_of_merit == pytest.approx(-29.235208518732776, 1.0e-4)
7979

8080
g0_linear_light = ag.Galaxy(
8181
redshift=0.5, bulge=ag.lp_linear.Sersic(sersic_index=1.0, centre=(0.05, 0.05))
@@ -157,7 +157,7 @@ def test__fit_figure_of_merit(
157157
)
158158

159159
assert fit.perform_inversion is True
160-
assert fit.figure_of_merit == pytest.approx(-22.87827302, 1.0e-4)
160+
assert fit.figure_of_merit == pytest.approx(-22.8918119554022, 1.0e-4)
161161

162162
g0 = ag.Galaxy(redshift=0.5, bulge=ag.lp.Sersic(intensity=1.0, centre=(0.05, 0.05)))
163163
g1 = ag.Galaxy(redshift=0.5, bulge=ag.lp.Sersic(intensity=1.0, centre=(0.05, 0.05)))
@@ -231,7 +231,7 @@ def test__fit__model_dataset__grid_offset__handles_special_behaviour(
231231
dataset_model=ag.DatasetModel(grid_offset=(1.0, 2.0)),
232232
)
233233

234-
assert fit.figure_of_merit == pytest.approx(-22.9005, 1.0e-4)
234+
assert fit.figure_of_merit == pytest.approx(-22.914118686169, 1.0e-4)
235235

236236

237237
def test__galaxy_model_image_dict(masked_imaging_7x7):
@@ -307,13 +307,13 @@ def test__galaxy_model_image_dict(masked_imaging_7x7):
307307

308308
assert (fit.galaxy_model_image_dict[g0] == np.zeros(9)).all()
309309

310-
assert fit.galaxy_model_image_dict[g1][4] == pytest.approx(1.2570779, 1.0e-4)
311-
assert fit.galaxy_model_image_dict[g1].native == pytest.approx(
312-
fit.inversion.mapped_reconstructed_image.native, 1.0e-4
310+
assert fit.galaxy_model_image_dict[g1][4] == pytest.approx(1.25795063, 1.0e-4)
311+
assert fit.galaxy_model_image_dict[g1].native.array == pytest.approx(
312+
fit.inversion.mapped_reconstructed_image.native.array, 1.0e-4
313313
)
314314

315-
assert fit.model_data.native == pytest.approx(
316-
fit.galaxy_model_image_dict[g1].native, 1.0e-4
315+
assert fit.model_data.native.array == pytest.approx(
316+
fit.galaxy_model_image_dict[g1].native.array, 1.0e-4
317317
)
318318

319319
# Linear Light PRofiles + Pixelization + Regularizaiton
@@ -344,10 +344,10 @@ def test__galaxy_model_image_dict(masked_imaging_7x7):
344344
-9.658085312, 1.0e-4
345345
)
346346
assert fit.galaxy_model_image_dict[galaxy_pix_0][4] == pytest.approx(
347-
1.107969179, 1.0e-4
347+
1.10780906, 1.0e-4
348348
)
349349
assert fit.galaxy_model_image_dict[galaxy_pix_1][4] == pytest.approx(
350-
1.1079691840, 1.0e-4
350+
1.10780906, 1.0e-4
351351
)
352352

353353
mapped_reconstructed_image = (

test_autogalaxy/interferometer/test_fit_interferometer.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def test__fit_figure_of_merit(interferometer_7):
5252
)
5353

5454
assert fit.perform_inversion is True
55-
assert fit.figure_of_merit == pytest.approx(-66.90612, 1.0e-4)
55+
assert fit.figure_of_merit == pytest.approx(-71.770448724198, 1.0e-4)
5656

5757
galaxy_light = ag.Galaxy(
5858
redshift=0.5, bulge=ag.lp.Sersic(intensity=1.0, centre=(0.05, 0.05))
@@ -72,7 +72,7 @@ def test__fit_figure_of_merit(interferometer_7):
7272
)
7373

7474
assert fit.perform_inversion is True
75-
assert fit.figure_of_merit == pytest.approx(-250.2259451235, 1.0e-4)
75+
assert fit.figure_of_merit == pytest.approx(-196.15073725528504, 1.0e-4)
7676

7777
g0_linear_light = ag.Galaxy(
7878
redshift=0.5, bulge=ag.lp_linear.Sersic(sersic_index=1.0, centre=(0.05, 0.05))
@@ -107,8 +107,8 @@ def test__fit_figure_of_merit(interferometer_7):
107107
dataset=interferometer_7, galaxies=[g0_linear_light, galaxy_pix]
108108
)
109109

110-
assert fit.log_evidence == pytest.approx(-35.17166165, 1e-4)
111-
assert fit.figure_of_merit == pytest.approx(-35.17166165, 1.0e-4)
110+
assert fit.log_evidence == pytest.approx(-37.4081355120388, 1e-4)
111+
assert fit.figure_of_merit == pytest.approx(-37.4081355120388, 1.0e-4)
112112

113113

114114
def test___galaxy_model_image_dict(interferometer_7):
@@ -212,10 +212,10 @@ def test___galaxy_model_image_dict(interferometer_7):
212212
)
213213
assert fit.galaxy_model_image_dict[g1] == pytest.approx(g1_image.array, 1.0e-4)
214214
assert fit.galaxy_model_image_dict[galaxy_pix_0][4] == pytest.approx(
215-
-0.00560239, 1.0e-2
215+
-0.00541699, 1.0e-2
216216
)
217217
assert fit.galaxy_model_image_dict[galaxy_pix_1][4] == pytest.approx(
218-
-0.00529861, 1.0e-2
218+
-0.00563034, 1.0e-2
219219
)
220220

221221
mapped_reconstructed_image = (
@@ -340,10 +340,10 @@ def test___galaxy_model_visibilities_dict(interferometer_7):
340340
g1_visibilities.array, 1.0e-4
341341
)
342342
assert fit.galaxy_model_visibilities_dict[galaxy_pix_0][0] == pytest.approx(
343-
-0.007889864570437388 + 0.22558558295704295j, 1.0e-4
343+
-0.00889895 + 0.22151583j, 1.0e-4
344344
)
345345
assert fit.galaxy_model_visibilities_dict[galaxy_pix_1][0] == pytest.approx(
346-
-0.007760865740849596 + 0.05639639626962996j, 1.0e-4
346+
-0.00857457 + 0.05537896j, 1.0e-4
347347
)
348348

349349
mapped_reconstructed_visibilities = (

0 commit comments

Comments
 (0)