Skip to content

feature/samples summary model #1024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jammy2211 merged 3 commits into from
Jul 23, 2024
+44 −16
Merged

feature/samples summary model #1024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f04c56a
fix test
rhayes777 Jul 22, 2024
2375966
readd model to samples summary when aggregating in database
rhayes777 Jul 22, 2024
8a9b6a7
test
rhayes777 Jul 22, 2024
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
5 changes: 4 additions & 1 deletion autofit/database/model/fit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,10 @@ def __getitem__(self, item: str):
"""
for p in self.jsons + self.arrays + self.hdus + self.pickles:
if p.name == item:
return p.value
value = p.value
if item == "samples_summary":
value.model = self.model
return value

return getattr(self, item)

Expand Down
9 changes: 9 additions & 0 deletions test_autofit/database/test_regression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,12 @@ def test_model_with_parameterless_component():
def test_instance_in_collection():
collection = af.Collection(gaussian=af.Gaussian())
assert list(collection.items()) == [("gaussian", af.Gaussian())]


def test_samples_summary_model():
fit = af.db.Fit()
model = af.Model(af.Gaussian)
fit["samples_summary"] = af.Samples(model=model, sample_list=[])
fit.model = model

assert fit["samples_summary"].model.cls == af.Gaussian
46 changes: 31 additions & 15 deletions test_autofit/serialise/test_samples.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,6 @@ def make_summary_dict():
"type": "instance",
"class_path": "autofit.non_linear.samples.summary.SamplesSummary",
"arguments": {
"errors_at_sigma_1": {
"type": "list",
"values": [(2.0, 0.0), (3.0, 0.0), (4.0, 0.0)],
},
"errors_at_sigma_3": {
"type": "list",
"values": [(2.0, 0.0), (3.0, 0.0), (4.0, 0.0)],
},
"values_at_sigma_3": {
"type": "list",
"values": [(0.0, 2.0), (1.0, 4.0), (2.0, 6.0)],
},
"max_log_likelihood_sample": {
"type": "instance",
"class_path": "autofit.non_linear.samples.sample.Sample",
Expand All @@ -81,11 +69,14 @@ def make_summary_dict():
},
},
},
"values_at_sigma_1": {
"values_at_sigma_3": {
"type": "list",
"values": [(0.0, 2.0), (1.0, 4.0), (2.0, 6.0)],
"values": [
{"type": "tuple", "values": [0.0, 2.0]},
{"type": "tuple", "values": [1.0, 4.0]},
{"type": "tuple", "values": [2.0, 6.0]},
],
},
"log_evidence": None,
"median_pdf_sample": {
"type": "instance",
"class_path": "autofit.non_linear.samples.sample.Sample",
Expand All @@ -103,6 +94,31 @@ def make_summary_dict():
},
},
},
"errors_at_sigma_3": {
"type": "list",
"values": [
{"type": "tuple", "values": [2.0, 0.0]},
{"type": "tuple", "values": [3.0, 0.0]},
{"type": "tuple", "values": [4.0, 0.0]},
],
},
"values_at_sigma_1": {
"type": "list",
"values": [
{"type": "tuple", "values": [0.0, 2.0]},
{"type": "tuple", "values": [1.0, 4.0]},
{"type": "tuple", "values": [2.0, 6.0]},
],
},
"errors_at_sigma_1": {
"type": "list",
"values": [
{"type": "tuple", "values": [2.0, 0.0]},
{"type": "tuple", "values": [3.0, 0.0]},
{"type": "tuple", "values": [4.0, 0.0]},
],
},
"log_evidence": None,
},
}

Expand Down