Skip to content

Commit 61a72b8

Browse files
committed
fix dataset unit tests
1 parent d3c5bbf commit 61a72b8

6 files changed

Lines changed: 12 additions & 21 deletions

File tree

autoarray/dataset/imaging/dataset.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,6 @@ def __init__(
135135
f"the image and noise-map yourself."
136136
)
137137

138-
print(type(data.array))
139-
140138
super().__init__(
141139
data=data,
142140
noise_map=noise_map,

autoarray/structures/grids/uniform_2d.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ def from_yx_1d(
320320
x = np.asarray(x)
321321

322322
return cls.no_mask(
323-
values=jnp.stack((y, x), axis=-1),
323+
values=np.stack((y, x), axis=-1),
324324
shape_native=shape_native,
325325
pixel_scales=pixel_scales,
326326
origin=origin,
@@ -547,14 +547,14 @@ def from_mask(
547547
The mask whose masked pixels are used to setup the grid.
548548
"""
549549

550-
grid_1d = grid_2d_util.grid_2d_slim_via_mask_from(
551-
mask_2d=mask._array,
550+
grid_2d = grid_2d_util.grid_2d_slim_via_mask_from(
551+
mask_2d=mask,
552552
pixel_scales=mask.pixel_scales,
553553
origin=mask.origin,
554554
)
555555

556556
return Grid2D(
557-
values=grid_1d,
557+
values=np.array(grid_2d),
558558
mask=mask,
559559
over_sample_size=over_sample_size,
560560
)

test_autoarray/dataset/abstract/test_dataset.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ def test__signal_to_noise_map():
3232

3333
dataset = ds.AbstractDataset(data=array, noise_map=noise_map)
3434

35-
assert (
36-
dataset.signal_to_noise_map.native == np.array([[0.1, 0.2], [0.1, 1.0]])
37-
).all()
35+
assert dataset.signal_to_noise_map.native == pytest.approx(np.array([[0.1, 0.2], [0.1, 1.0]]), 1.0e-4)
3836
assert dataset.signal_to_noise_max == 1.0
3937

4038
array = aa.Array2D.no_mask([[-1.0, 2.0], [3.0, -4.0]], pixel_scales=1.0)
@@ -43,9 +41,7 @@ def test__signal_to_noise_map():
4341

4442
dataset = ds.AbstractDataset(data=array, noise_map=noise_map)
4543

46-
assert (
47-
dataset.signal_to_noise_map.native == np.array([[0.0, 0.2], [0.1, 0.0]])
48-
).all()
44+
assert dataset.signal_to_noise_map.native == pytest.approx(np.array([[0.0, 0.2], [0.1, 0.0]]), 1.0e-4)
4945
assert dataset.signal_to_noise_max == 0.2
5046

5147

@@ -149,8 +145,8 @@ def test__apply_over_sampling(image_7x7, noise_map_7x7):
149145
grid_sub_2 = dataset_7x7.grids.lp
150146
grids_pixelization_sub_2 = dataset_7x7.grids.pixelization
151147

152-
dataset_7x7.grids.lp = dataset_7x7.grids.lp.at[0, 0].set(100.0)
153-
dataset_7x7.grids.pixelization = dataset_7x7.grids.pixelization.at[0, 0].set(100.0)
148+
dataset_7x7.grids.__dict__["lp"][0][0] = 100.0
149+
dataset_7x7.grids.__dict__["pixelization"][0][0] = 100.0
154150

155151
assert dataset_7x7.grids.lp[0][0] == pytest.approx(100.0, 1.0e-4)
156152
assert dataset_7x7.grids.pixelization[0][0] == pytest.approx(100.0, 1.0e-4)

test_autoarray/dataset/imaging/test_dataset.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def test__from_fits():
7878
)
7979

8080
assert (dataset.data.native == np.ones((3, 3))).all()
81-
assert (dataset.psf.native == (1.0 / 9.0) * np.ones((3, 3))).all()
81+
assert dataset.psf.native == pytest.approx((1.0 / 9.0) * np.ones((3, 3)), 1.0e-4)
8282
assert (dataset.noise_map.native == 3.0 * np.ones((3, 3))).all()
8383

8484
assert dataset.pixel_scales == (0.1, 0.1)
@@ -96,7 +96,7 @@ def test__from_fits():
9696
)
9797

9898
assert (dataset.data.native == np.ones((3, 3))).all()
99-
assert (dataset.psf.native == (1.0 / 9.0) * np.ones((3, 3))).all()
99+
assert dataset.psf.native == pytest.approx((1.0 / 9.0) * np.ones((3, 3)), 1.0e-4)
100100
assert (dataset.noise_map.native == 3.0 * np.ones((3, 3))).all()
101101

102102
assert dataset.pixel_scales == (0.1, 0.1)

test_autoarray/dataset/test_preprocess.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,15 +133,12 @@ def test__noise_map_from_image_exposure_time_map():
133133
data_eps=image, exposure_time_map=exposure_time_map
134134
)
135135

136-
assert (
137-
poisson_noise_map.native
138-
== np.array(
136+
assert poisson_noise_map.native == pytest.approx(np.array(
139137
[
140138
[np.sqrt(5.0), np.sqrt(6.0) / 2.0],
141139
[np.sqrt(30.0) / 3.0, np.sqrt(80.0) / 4.0],
142140
]
143-
)
144-
).all()
141+
), 1.0e-4)
145142

146143

147144
def test__noise_map_from_image_exposure_time_map_and_background_noise_map():
Binary file not shown.

0 commit comments

Comments
 (0)