-
Notifications
You must be signed in to change notification settings - Fork 71
Implement Generalized Pareto distribution #294
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
base: main
Are you sure you want to change the base?
Changes from 3 commits
7d8a5c5
22a3b0b
cb0ac01
c5ceda2
fd11271
140a7b8
d5054b2
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -221,6 +221,163 @@ def moment(rv, size, mu, sigma, xi): | |||||
return mode | ||||||
|
||||||
|
||||||
# Generalized Pareto Distribution | ||||||
class GenParetoRV(RandomVariable): | ||||||
name: str = "Generalized Pareto Distribution" | ||||||
|
name: str = "Generalized Pareto Distribution" | |
name: str = "Generalized Pareto" |
Outdated
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.
_print_name: Tuple[str, str] = ("Generalized Pareto Distribution", "\\operatorname{GP}") | |
_print_name: Tuple[str, str] = ("Generalized Pareto", "\\operatorname{GenPareto}") |
Outdated
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.
This is not strictly necessary because most users will never call the RV directly. We usually provide default values through the PyMC distribution class
def __call__(self, mu=0.0, sigma=1.0, xi=1.0, size=None, **kwargs) -> TensorVariable: | |
return super().__call__(mu, sigma, xi, size=size, **kwargs) |
Outdated
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.
gp = GenParetoRV() | |
gen_pareto = GenParetoRV() |
Outdated
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.
Could be worth a note saying this is more restrictive than other definitions of the GenPareto (in wikipedia there seems to be special cases for xi < 0?)
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.
xi < 0 are less seen for modelling extreme values. I will add a note here.
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.
xi < 0 are less seen for modelling extreme values. I will add a note here.
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.
These docstrings are incomplete, and the logp
function is not really user facing, so it's better to not include anything at all
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.
I think the logp for Generalized Pareto distribution should be
我认为广义帕累托分布的 logp 应该是
def logp(value, mu, sigma, xi):
"""
Calculate log-probability of Generalized Pareto distribution
计算广义帕累托分布的对数概率
at specified value. 在指定值。
Parameters
----------
value: numeric
Value(s) for which log-probability is calculated. If the log probabilities for multiple
values are desired the values must be provided in a numpy array or Pytensor tensor
Returns
-------
TensorVariable
"""
scaled = (value - mu) / sigma
logp_expression = pt.switch(
pt.isclose(xi, 0),
-1 * scaled,
-1 * pt.log(sigma) - ((xi + 1) / xi) * pt.log1p(xi * scaled),
)
logp = pt.switch(pt.gt(1 + xi * scaled, 0), logp_expression, -np.inf)
return check_parameters(logp, sigma > 0, pt.and_(xi > -1, xi < 1), msg="sigma > 0 or -1 < xi < 1")
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.
Same here
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.
We don't need to provide a real "moment", just anything that always has finite logp. So in this case moment = mu
may be good enough?
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.
Are you suggesting that we only need to return mu
instead of the true mean? Or shall I just leave it as it?
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.
Yes, that you can just return mu
and take away the check_parameter part. Just make sure you broadcast mu with the other parameters in case size is None
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -33,7 +33,7 @@ | |
) | ||
|
||
# the distributions to be tested | ||
from pymc_experimental.distributions import Chi, GenExtreme, Maxwell | ||
from pymc_experimental.distributions import Chi, GenExtreme, GenPareto, Maxwell | ||
|
||
|
||
class TestGenExtremeClass: | ||
|
@@ -138,6 +138,64 @@ class TestGenExtreme(BaseTestDistributionRandom): | |
] | ||
|
||
|
||
class TestGenParetoClass: | ||
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. Missing the test for moment 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. I think the logp for Generalized Pareto distribution should be
|
||
""" | ||
Wrapper class so that tests of experimental additions can be dropped into | ||
PyMC directly on adoption. | ||
|
||
pm.logp(GenPareto.dist(mu=0.,sigma=1.,xi=5.),value=1.) | ||
""" | ||
|
||
def test_logp(self): | ||
def ref_logp(value, mu, sigma, xi): | ||
if xi == 0: | ||
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. Scipy genpareto logpdf fails for xi = 0? 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. Yes, I do noticed a tiny bug in scipy's function when calculating pdf for general pareto distribution with xi==0. Will double check and sumbit a PR to fix that as well. |
||
return sp.expon.logpdf((value - mu) / sigma) | ||
else: | ||
return sp.genpareto.logpdf(value, c=xi, loc=mu, scale=sigma) | ||
|
||
check_logp( | ||
GenPareto, | ||
R, | ||
{"mu": R, "sigma": Rplusbig, "xi": Rplusbig}, | ||
ref_logp, | ||
decimal=select_by_precision(float64=6, float32=2), | ||
skip_paramdomain_outside_edge_test=True, | ||
Comment on lines
+161
to
+162
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. Why are you skipping the outside edge test? 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. Since I am bounding the xi to be >= 0, I'd like to skip the outside edge test. 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. The point of that test is to make sure the bounding is defined correctly, so you shouldn't skip |
||
) | ||
|
||
def test_logcdf(self): | ||
def ref_logc(value, mu, sigma, xi): | ||
if xi == 0: | ||
return sp.expon.logcdf((value - mu) / sigma) | ||
else: | ||
return sp.genpareto.logcdf(value, c=xi, loc=mu, scale=sigma) | ||
|
||
check_logcdf( | ||
GenPareto, | ||
R, | ||
{ | ||
"mu": R, | ||
"sigma": Rplusbig, | ||
"xi": Rplusbig, | ||
}, | ||
ref_logc, | ||
decimal=select_by_precision(float64=6, float32=2), | ||
skip_paramdomain_outside_edge_test=True, | ||
) | ||
|
||
|
||
class TestGenPareto(BaseTestDistributionRandom): | ||
pymc_dist = GenPareto | ||
pymc_dist_params = {"mu": 0, "sigma": 1, "xi": 1} | ||
expected_rv_op_params = {"mu": 0, "sigma": 1, "xi": 1} | ||
reference_dist_params = {"loc": 0, "scale": 1, "c": 0.1} | ||
reference_dist = seeded_scipy_distribution_builder("genpareto") | ||
tests_to_run = [ | ||
"check_pymc_params_match_rv_op", | ||
"check_pymc_draws_match_reference", | ||
"check_rv_size", | ||
] | ||
|
||
|
||
class TestChiClass: | ||
""" | ||
Wrapper class so that tests of experimental additions can be dropped into | ||
|
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.
Should subclass
ScipyRandomVariable
because Scipy RVs (sometimes) do something dumb withsize=(1,)