Skip to content

Commit 2788bcb

Browse files
Jammy2211Jammy2211
authored andcommitted
finish
1 parent b4a957b commit 2788bcb

File tree

3 files changed

+52
-18
lines changed

3 files changed

+52
-18
lines changed

autoarray/inversion/inversion/imaging/mapping.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,9 @@ def _mapped_reconstructed_data_dict_from(
131131
mask=self.mask,
132132
)
133133

134-
mapped_reconstructed_data_dict[linear_obj] = mapped_reconstructed_operated_data
134+
mapped_reconstructed_data_dict[linear_obj] = (
135+
mapped_reconstructed_operated_data
136+
)
135137

136138
return mapped_reconstructed_data_dict
137139

test_autoarray/inversion/inversion/test_abstract.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,9 @@ def test__mapped_reconstructed_operated_data():
394394
reconstruction_dict=[None],
395395
)
396396

397-
assert (inversion.mapped_reconstructed_operated_data_dict[linear_obj_0] == np.ones(3)).all()
397+
assert (
398+
inversion.mapped_reconstructed_operated_data_dict[linear_obj_0] == np.ones(3)
399+
).all()
398400
assert (inversion.mapped_reconstructed_operated_data == np.ones(3)).all()
399401

400402
linear_obj_1 = aa.m.MockLinearObj()
@@ -411,9 +413,12 @@ def test__mapped_reconstructed_operated_data():
411413
reconstruction_dict=[None, None],
412414
)
413415

414-
assert (inversion.mapped_reconstructed_operated_data_dict[linear_obj_0] == np.ones(2)).all()
415416
assert (
416-
inversion.mapped_reconstructed_operated_data_dict[linear_obj_1] == 2.0 * np.ones(2)
417+
inversion.mapped_reconstructed_operated_data_dict[linear_obj_0] == np.ones(2)
418+
).all()
419+
assert (
420+
inversion.mapped_reconstructed_operated_data_dict[linear_obj_1]
421+
== 2.0 * np.ones(2)
417422
).all()
418423
assert (inversion.mapped_reconstructed_operated_data == 3.0 * np.ones(2)).all()
419424

test_autoarray/inversion/inversion/test_factory.py

Lines changed: 41 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ def test__inversion_imaging__via_linear_obj_func_list(masked_imaging_7x7_no_blur
2222

2323
assert isinstance(inversion.linear_obj_list[0], aa.m.MockLinearObjFuncList)
2424
assert isinstance(inversion, aa.InversionImagingMapping)
25-
assert inversion.mapped_reconstructed_operated_data == pytest.approx(np.ones(9), 1.0e-4)
25+
assert inversion.mapped_reconstructed_operated_data == pytest.approx(
26+
np.ones(9), 1.0e-4
27+
)
2628
assert inversion.reconstruction == pytest.approx(np.array([2.0]), 1.0e-4)
2729

2830
# Overwrites use_sparse_operator to false.
@@ -38,7 +40,9 @@ def test__inversion_imaging__via_linear_obj_func_list(masked_imaging_7x7_no_blur
3840

3941
assert isinstance(inversion.linear_obj_list[0], aa.m.MockLinearObjFuncList)
4042
assert isinstance(inversion, aa.InversionImagingMapping)
41-
assert inversion.mapped_reconstructed_operated_data == pytest.approx(np.ones(9), 1.0e-4)
43+
assert inversion.mapped_reconstructed_operated_data == pytest.approx(
44+
np.ones(9), 1.0e-4
45+
)
4246
assert inversion.reconstruction == pytest.approx(np.array([2.0]), 1.0e-4)
4347

4448
# Works with multiple parameters
@@ -56,7 +60,9 @@ def test__inversion_imaging__via_linear_obj_func_list(masked_imaging_7x7_no_blur
5660
assert isinstance(inversion.linear_obj_list[0], aa.m.MockLinearObjFuncList)
5761
assert isinstance(inversion, aa.InversionImagingMapping)
5862
assert inversion.reconstruction == pytest.approx(np.array([0.0, 2.0]), abs=1.0e-4)
59-
assert inversion.mapped_reconstructed_operated_data == pytest.approx(np.ones(9), 1.0e-4)
63+
assert inversion.mapped_reconstructed_operated_data == pytest.approx(
64+
np.ones(9), 1.0e-4
65+
)
6066

6167

6268
def test__inversion_imaging__via_mapper(
@@ -78,7 +84,9 @@ def test__inversion_imaging__via_mapper(
7884
# assert inversion.log_det_curvature_reg_matrix_term == pytest.approx(
7985
# 4.609440907938719, 1.0e-4
8086
# )
81-
assert inversion.mapped_reconstructed_operated_data == pytest.approx(np.ones(9), 1.0e-4)
87+
assert inversion.mapped_reconstructed_operated_data == pytest.approx(
88+
np.ones(9), 1.0e-4
89+
)
8290

8391
masked_imaging_7x7_no_blur_sparse_operator = (
8492
masked_imaging_7x7_no_blur.apply_sparse_operator_cpu()
@@ -93,7 +101,9 @@ def test__inversion_imaging__via_mapper(
93101
assert inversion.log_det_curvature_reg_matrix_term == pytest.approx(
94102
7.257175708246, 1.0e-4
95103
)
96-
assert inversion.mapped_reconstructed_operated_data == pytest.approx(np.ones(9), 1.0e-4)
104+
assert inversion.mapped_reconstructed_operated_data == pytest.approx(
105+
np.ones(9), 1.0e-4
106+
)
97107

98108
inversion = aa.Inversion(
99109
dataset=masked_imaging_7x7_no_blur,
@@ -103,7 +113,9 @@ def test__inversion_imaging__via_mapper(
103113
assert isinstance(inversion.linear_obj_list[0], aa.MapperDelaunay)
104114
assert isinstance(inversion, aa.InversionImagingMapping)
105115
assert inversion.log_det_curvature_reg_matrix_term == pytest.approx(10.6674, 1.0e-4)
106-
assert inversion.mapped_reconstructed_operated_data == pytest.approx(np.ones(9), 1.0e-4)
116+
assert inversion.mapped_reconstructed_operated_data == pytest.approx(
117+
np.ones(9), 1.0e-4
118+
)
107119

108120
inversion = aa.Inversion(
109121
dataset=masked_imaging_7x7_no_blur_sparse_operator,
@@ -112,7 +124,9 @@ def test__inversion_imaging__via_mapper(
112124

113125
assert isinstance(inversion.linear_obj_list[0], aa.MapperDelaunay)
114126
assert inversion.log_det_curvature_reg_matrix_term == pytest.approx(10.6674, 1.0e-4)
115-
assert inversion.mapped_reconstructed_operated_data == pytest.approx(np.ones(9), 1.0e-4)
127+
assert inversion.mapped_reconstructed_operated_data == pytest.approx(
128+
np.ones(9), 1.0e-4
129+
)
116130

117131

118132
def test__inversion_imaging__via_regularizations(
@@ -141,7 +155,9 @@ def test__inversion_imaging__via_regularizations(
141155
assert inversion.log_det_curvature_reg_matrix_term == pytest.approx(
142156
10.66747, 1.0e-4
143157
)
144-
assert inversion.mapped_reconstructed_operated_data == pytest.approx(np.ones(9), 1.0e-4)
158+
assert inversion.mapped_reconstructed_operated_data == pytest.approx(
159+
np.ones(9), 1.0e-4
160+
)
145161

146162
mapper = copy.copy(delaunay_mapper_9_3x3)
147163
mapper.regularization = regularization_adaptive_brightness
@@ -155,7 +171,9 @@ def test__inversion_imaging__via_regularizations(
155171
assert inversion.log_det_curvature_reg_matrix_term == pytest.approx(
156172
47.410169, 1.0e-4
157173
)
158-
assert inversion.mapped_reconstructed_operated_data == pytest.approx(np.ones(9), 1.0e-4)
174+
assert inversion.mapped_reconstructed_operated_data == pytest.approx(
175+
np.ones(9), 1.0e-4
176+
)
159177

160178

161179
def test__inversion_imaging__source_pixel_zeroed_indices(
@@ -210,7 +228,9 @@ def test__inversion_imaging__via_linear_obj_func_and_mapper(
210228
np.array([2.0]), 1.0e-4
211229
)
212230
assert inversion.reconstruction_dict[rectangular_mapper_7x7_3x3][0] < 1.0e-4
213-
assert inversion.mapped_reconstructed_operated_data == pytest.approx(np.ones(9), 1.0e-4)
231+
assert inversion.mapped_reconstructed_operated_data == pytest.approx(
232+
np.ones(9), 1.0e-4
233+
)
214234

215235
masked_imaging_7x7_no_blur_sparse_operator = (
216236
masked_imaging_7x7_no_blur.apply_sparse_operator_cpu()
@@ -293,8 +313,11 @@ def test__inversion_imaging__compare_mapping_and_sparse_operator_values(
293313
assert inversion_sparse_operator.reconstruction == pytest.approx(
294314
inversion_mapping.reconstruction, 1.0e-4
295315
)
296-
assert inversion_sparse_operator.mapped_reconstructed_operated_data.array == pytest.approx(
297-
inversion_mapping.mapped_reconstructed_operated_data.array, 1.0e-4
316+
assert (
317+
inversion_sparse_operator.mapped_reconstructed_operated_data.array
318+
== pytest.approx(
319+
inversion_mapping.mapped_reconstructed_operated_data.array, 1.0e-4
320+
)
298321
)
299322
assert inversion_sparse_operator.log_det_curvature_reg_matrix_term == pytest.approx(
300323
inversion_mapping.log_det_curvature_reg_matrix_term
@@ -546,7 +569,9 @@ def test__inversion_matrices__x2_mappers(
546569
assert inversion.mapped_reconstructed_operated_data_dict[delaunay_mapper_9_3x3][
547570
3
548571
] == pytest.approx(0.49999704, 1.0e-4)
549-
assert inversion.mapped_reconstructed_operated_data[4] == pytest.approx(0.99999998, 1.0e-4)
572+
assert inversion.mapped_reconstructed_operated_data[4] == pytest.approx(
573+
0.99999998, 1.0e-4
574+
)
550575

551576

552577
def test__inversion_imaging__positive_only_solver(masked_imaging_7x7_no_blur):
@@ -566,7 +591,9 @@ def test__inversion_imaging__positive_only_solver(masked_imaging_7x7_no_blur):
566591

567592
assert isinstance(inversion.linear_obj_list[0], aa.m.MockLinearObjFuncList)
568593
assert isinstance(inversion, aa.InversionImagingMapping)
569-
assert inversion.mapped_reconstructed_operated_data == pytest.approx(np.ones(9), 1.0e-4)
594+
assert inversion.mapped_reconstructed_operated_data == pytest.approx(
595+
np.ones(9), 1.0e-4
596+
)
570597
assert inversion.reconstruction == pytest.approx(np.array([2.0]), 1.0e-4)
571598

572599

0 commit comments

Comments
 (0)