Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions dataset/point_source/simple/point_dataset_positions_only.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
"class_path": "autolens.point.dataset.PointDataset",
"arguments": {
"name": "point_0",
"fluxes_noise_map": null,
"positions_noise_map": {
"type": "instance",
"class_path": "autoarray.structures.arrays.irregular.ArrayIrregular",
"arguments": {
"values": {
"type": "ndarray",
"array": [
0.005,
0.005
],
"dtype": "float64"
}
}
},
"time_delays": null,
"positions": {
"type": "instance",
"class_path": "autoarray.structures.grids.irregular_2d.Grid2DIrregular",
Expand All @@ -23,23 +39,8 @@
}
}
},
"time_delays_noise_map": null,
"fluxes": null,
"positions_noise_map": {
"type": "instance",
"class_path": "autoarray.structures.arrays.irregular.ArrayIrregular",
"arguments": {
"values": {
"type": "ndarray",
"array": [
0.2,
0.2
],
"dtype": "float64"
}
}
},
"time_delays": null,
"fluxes_noise_map": null
"redshift": null,
"time_delays_noise_map": null
}
}
10 changes: 5 additions & 5 deletions dataset/point_source/simple/tracer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
"type": "instance",
"class_path": "autolens.lens.tracer.Tracer",
"arguments": {
"cosmology": {
"type": "instance",
"class_path": "autogalaxy.cosmology.model.Planck15",
"arguments": {}
},
"galaxies": {
"type": "list",
"values": [
Expand Down Expand Up @@ -48,6 +43,11 @@
}
}
]
},
"cosmology": {
"type": "instance",
"class_path": "autogalaxy.cosmology.model.Planck15",
"arguments": {}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@

np.testing.assert_allclose(
np.array(result),
1.313508,
-83.38049778,
rtol=1e-4,
err_msg="point_source/image_plane: JAX vmap likelihood mismatch",
)
Expand Down
2 changes: 1 addition & 1 deletion scripts/jax_likelihood_functions/point_source/point.py
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@

np.testing.assert_allclose(
np.array(result),
1.313508,
-83.38049778,
rtol=1e-4,
err_msg="point: JAX vmap likelihood mismatch",
)
Expand Down
4 changes: 2 additions & 2 deletions scripts/jax_likelihood_functions/point_source/source_plane.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@

# Regression constant filled in on first run against the workspace_test
# seeded PointDataset (``scripts/jax_likelihood_functions/point_source/simulator.py``).
EXPECTED_VMAP_LOG_LIKELIHOOD_SOURCE_PLANE = -199.1555813
EXPECTED_VMAP_LOG_LIKELIHOOD_SOURCE_PLANE = -331481.25978149

np.testing.assert_allclose(
np.array(result),
Expand Down Expand Up @@ -180,7 +180,7 @@
log_likelihood_np = float(fit_np.log_likelihood)
print("NumPy fit.log_likelihood:", log_likelihood_np)

EXPECTED_EAGER_LOG_LIKELIHOOD_SOURCE_PLANE = -199.1555813
EXPECTED_EAGER_LOG_LIKELIHOOD_SOURCE_PLANE = -331481.26508536364

np.testing.assert_allclose(
log_likelihood_np,
Expand Down
Loading