-
Notifications
You must be signed in to change notification settings - Fork 12
Add discrete noise distributions #654
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.
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
Open
dweindl
wants to merge
2
commits into
main
Choose a base branch
from
discrete_noise_distr
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -521,6 +521,8 @@ Detailed field description | |
| - ``measurement`` [NUMERIC, REQUIRED] | ||
|
|
||
| The measured value in the same units/scale as the model output. | ||
| If the corresponding ``noiseDistribution`` specifies a discrete distribution, | ||
| this value must be integral. | ||
|
|
||
| - ``time`` [NUMERIC OR ``inf``, REQUIRED] | ||
|
|
||
|
|
@@ -746,11 +748,25 @@ Detailed field description | |
| Noise distributions | ||
| ~~~~~~~~~~~~~~~~~~~ | ||
|
|
||
| Denote by :math:`m` the measured value, | ||
| The supported continuous and discrete probability distributions to model | ||
| measurement noise are listed below. | ||
| Those distributions are for a single data point. | ||
| For a collection :math:`D=\{m_i\}_i` of data points and corresponding | ||
| simulations :math:`Y=\{y_i\}_i` | ||
| and noise parameters :math:`\Sigma=\{\sigma_i\}_i`, | ||
| the current specification assumes independence, i.e. the full distribution is | ||
|
|
||
| .. math:: | ||
| \pi(D|Y,\Sigma) = \prod_i\pi(m_i|y_i,\sigma_i) | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. As we have single-parameter distributions (e.g., Poison) that does not include a noise parameter, using a more general formula like: \pi(D|\theta) would maybe work better? |
||
|
|
||
| Continuous distributions | ||
| ++++++++++++++++++++++++ | ||
|
|
||
| Denote by :math:`m:=\text{measurement}` the measured value, | ||
| :math:`y:=\text{observableFormula}` the simulated value | ||
| (the location parameter of the noise distribution), | ||
| and :math:`\sigma` the scale parameter of the noise distribution | ||
| as given via the ``noiseFormula`` field (the standard deviation of a normal, | ||
| and :math:`\sigma := \text{noiseFormula}` the scale parameter of the noise | ||
| distribution (e.g., the standard deviation of a normal, | ||
| or the scale parameter of a Laplace model). | ||
| Then we have the following effective noise distributions: | ||
|
|
||
|
|
@@ -780,14 +796,40 @@ Then we have the following effective noise distributions: | |
| - .. math:: | ||
| \pi(m|y,\sigma) = \frac{1}{2\sigma m}\exp\left(-\frac{|\log m - \log y|}{\sigma}\right) | ||
|
|
||
| The distributions above are for a single data point. | ||
| For a collection :math:`D=\{m_i\}_i` of data points and corresponding | ||
| simulations :math:`Y=\{y_i\}_i` | ||
| and noise parameters :math:`\Sigma=\{\sigma_i\}_i`, | ||
| the current specification assumes independence, i.e. the full distribution is | ||
| Discrete distributions | ||
| ++++++++++++++++++++++ | ||
|
|
||
| .. math:: | ||
| \pi(D|Y,\Sigma) = \prod_i\pi(m_i|y_i,\sigma_i) | ||
| Denote by :math:`m` the ``measurement`` in the measurement table, | ||
| then we have the following effective noise distributions: | ||
|
|
||
| .. list-table:: | ||
| :header-rows: 1 | ||
| :widths: 10 10 80 | ||
|
|
||
| * - Type | ||
| - ``noiseDistribution`` | ||
| - Probability density function (PDF) | ||
| * - Poisson distribution | ||
| - ``poisson`` | ||
| - | :math:`\pi(m|\lambda) = \frac{\lambda^m\exp(-\lambda)}{m!}` | ||
| | where the rate :math:`\lambda` is given via ``observableFormula``. | ||
| | ``noiseFormula`` must be empty in this case. | ||
| | The measurement :math:`m` is the number of observed events | ||
| | and must be a non-negative integer. | ||
| * - Binomial distribution | ||
| - ``binomial`` | ||
| - | :math:`\pi(m|n,p) = \binom{n}{m}p^m(1-p)^{n-m}` | ||
| | where :math:`n` is the number of trials given via ``observableFormula`` | ||
| | and :math:`p` the probability of success given via ``noiseFormula``. | ||
| | The measurement :math:`m` is the number of observed successes | ||
| | and must be an integer between 0 and :math:`n`. | ||
| * - Negative binomial distribution | ||
| - ``negative-binomial`` | ||
| - | :math:`\pi(m|r,p) = \binom{m+r-1}{m}p^r(1-p)^m` | ||
| | where :math:`r` is the number of successes given via ``observableFormula`` | ||
| | and :math:`p` the probability of success given via ``noiseFormula``. | ||
| | The measurement :math:`m` is the number of observed failures | ||
| | and must be a non-negative integer. | ||
|
|
||
| .. _v2_parameter_table: | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.