Skip to content

Commit 87931b6

Browse files
committed
fix fit tests
1 parent 2c02e39 commit 87931b6

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

autoarray/fit/fit_dataset.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def chi_squared(self) -> float:
8686
"""
8787
Returns the chi-squared terms of the model data's fit to an dataset, by summing the chi-squared-map.
8888
"""
89-
return fit_util.chi_squared_from(chi_squared_map=self.chi_squared_map)
89+
return fit_util.chi_squared_from(chi_squared_map=self.chi_squared_map.array)
9090

9191
@property
9292
def noise_normalization(self) -> float:
@@ -95,7 +95,7 @@ def noise_normalization(self) -> float:
9595
9696
[Noise_Term] = sum(log(2*pi*[Noise]**2.0))
9797
"""
98-
return fit_util.noise_normalization_from(noise_map=self.noise_map)
98+
return fit_util.noise_normalization_from(noise_map=self.noise_map.array)
9999

100100
@property
101101
def log_likelihood(self) -> float:

autoarray/fit/fit_util.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def chi_squared_from(*, chi_squared_map: ty.DataLike) -> float:
8484
chi_squared_map
8585
The chi-squared-map of values of the model-data fit to the dataset.
8686
"""
87-
return jnp.sum(np.array(chi_squared_map))
87+
return jnp.sum(chi_squared_map)
8888

8989

9090
def noise_normalization_from(*, noise_map: ty.DataLike) -> float:
@@ -98,7 +98,7 @@ def noise_normalization_from(*, noise_map: ty.DataLike) -> float:
9898
noise_map
9999
The masked noise-map of the dataset.
100100
"""
101-
return jnp.sum(jnp.log(2 * jnp.pi * np.array(noise_map)**2.0))
101+
return jnp.sum(jnp.log(2 * jnp.pi * noise_map**2.0))
102102

103103

104104
def normalized_residual_map_complex_from(

test_autoarray/fit/test_fit_imaging.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def test__data_and_model_are_identical__no_masking__check_values_are_correct():
3030

3131
assert fit.chi_squared == 0.0
3232
assert fit.reduced_chi_squared == 0.0
33-
assert fit.noise_normalization == np.sum(np.log(2 * np.pi * noise_map**2.0))
33+
assert fit.noise_normalization == np.sum(np.log(2 * np.pi * noise_map.array**2.0))
3434
assert fit.log_likelihood == -0.5 * (fit.chi_squared + fit.noise_normalization)
3535

3636

@@ -59,7 +59,7 @@ def test__data_and_model_are_different__include_masking__check_values_are_correc
5959

6060
assert fit.chi_squared == 0.25
6161
assert fit.reduced_chi_squared == 0.25 / 3.0
62-
assert fit.noise_normalization == np.sum(np.log(2 * np.pi * noise_map**2.0))
62+
assert fit.noise_normalization == np.sum(np.log(2 * np.pi * noise_map.array**2.0))
6363
assert fit.log_likelihood == -0.5 * (fit.chi_squared + fit.noise_normalization)
6464

6565

@@ -92,7 +92,7 @@ def test__data_and_model_are_identical__inversion_included__changes_certain_prop
9292

9393
assert fit.chi_squared == 0.0
9494
assert fit.reduced_chi_squared == 0.0
95-
assert fit.noise_normalization == np.sum(np.log(2 * np.pi * noise_map**2.0))
95+
assert fit.noise_normalization == np.sum(np.log(2 * np.pi * noise_map.array**2.0))
9696
assert fit.log_likelihood == -0.5 * (fit.chi_squared + fit.noise_normalization)
9797

9898
assert fit.log_likelihood_with_regularization == -0.5 * (

0 commit comments

Comments
 (0)