Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
lscsoft
bilby
Commits
529f1988
Commit
529f1988
authored
Jul 04, 2018
by
Gregory Ashton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds basic functionality for adding posterior sample sets together
parent
82a23f1c
Pipeline
#24199
passed with stages
in 2 minutes and 13 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
tupak/core/result.py
tupak/core/result.py
+11
-2
tupak/core/sampler.py
tupak/core/sampler.py
+1
-0
No files found.
tupak/core/result.py
View file @
529f1988
...
...
@@ -73,6 +73,15 @@ class Result(dict):
val
=
self
.
_standardise_a_string
(
dictionary
[
key
])
setattr
(
self
,
key
,
val
)
def
__add__
(
self
,
other
):
if
other
.
sampler
!=
self
.
sampler
:
raise
ValueError
(
"Unable to add results generated from different samplers"
)
self
.
samples
=
np
.
concatenate
([
self
.
samples
,
other
.
samples
])
self
.
posterior
=
pd
.
concat
([
self
.
posterior
,
other
.
posterior
])
return
self
def
__dir__
(
self
):
""" Adds tab completion in ipython
...
...
@@ -99,13 +108,13 @@ class Result(dict):
"log_noise_evidence: {:6.3f}
\n
"
"log_evidence: {:6.3f} +/- {:6.3f}
\n
"
"log_bayes_factor: {:6.3f} +/- {:6.3f}
\n
"
.
format
(
len
(
self
.
samples
),
self
.
log_noise_evidence
,
self
.
log_evidence
,
.
format
(
len
(
self
.
posterior
),
self
.
log_noise_evidence
,
self
.
log_evidence
,
self
.
log_evidence_err
,
self
.
log_bayes_factor
,
self
.
log_evidence_err
))
else
:
return
(
"nsamples: {:d}
\n
"
"log_evidence: {:6.3f} +/- {:6.3f}
\n
"
.
format
(
len
(
self
.
samples
),
self
.
log_evidence
,
self
.
log_evidence_err
))
.
format
(
len
(
self
.
posterior
),
self
.
log_evidence
,
self
.
log_evidence_err
))
else
:
return
''
...
...
tupak/core/sampler.py
View file @
529f1988
...
...
@@ -187,6 +187,7 @@ class Sampler(object):
"""
result
=
Result
()
result
.
sampler
=
self
.
__class__
.
__name__
.
lower
()
result
.
search_parameter_keys
=
self
.
__search_parameter_keys
result
.
fixed_parameter_keys
=
self
.
__fixed_parameter_keys
result
.
parameter_labels
=
[
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment