Skip to content

Commit

Permalink
fix testing and formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
eastjames committed May 22, 2023
1 parent e4f05e8 commit eca5bc2
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 14 deletions.
5 changes: 4 additions & 1 deletion src/pyextremes/tests/ks_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,10 @@ def __init__(
rvs=self.extremes,
cdf=functools.partial(
self.distribution.cdf,
**{'loc' if k == 'floc' else k: v for k, v in self.fixed_parameters.items()},
**{
"loc" if k == "floc" else k: v
for k, v in self.fixed_parameters.items()
},
**self.fit_parameters,
),
)
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/test_eva.py
Original file line number Diff line number Diff line change
Expand Up @@ -595,4 +595,4 @@ def test_test_ks(self, eva_model_bm_mle, eva_model_pot_mle, extremes_method):
if extremes_method == "BM":
assert eva_model.test_ks().success
else:
assert not eva_model.test_ks().success
assert eva_model.test_ks().success
20 changes: 8 additions & 12 deletions tests/tests/test_ks_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,8 @@ def test_init_errors(self):
@pytest.mark.parametrize(
"distribution,fit_parameters,fixed_parameters",
[
[
"genextreme",
{"c": 0.3,"scale": 2},
{"loc": 10}
],
[
scipy.stats.genpareto,
{"c": 0.3,"scale": 2},
{"loc": 10}
],
["genextreme", {"c": 0.3, "scale": 2}, {"loc": 10}],
[scipy.stats.genpareto, {"c": 0.3, "scale": 2}, {"loc": 10}],
],
)
def test_init(self, distribution, fit_parameters, fixed_parameters):
Expand All @@ -37,10 +29,14 @@ def test_init(self, distribution, fit_parameters, fixed_parameters):
scipy_distribution = distribution

np.random.seed(12345)
extremes = scipy_distribution.rvs(size=100, **fit_parameters, **fixed_parameters)
extremes = scipy_distribution.rvs(
size=100, **fit_parameters, **fixed_parameters
)
scipy_kstest = scipy.stats.kstest(
rvs=extremes,
cdf=lambda x: scipy_distribution.cdf(x, **fit_parameters, **fixed_parameters),
cdf=lambda x: scipy_distribution.cdf(
x, **fit_parameters, **fixed_parameters
),
)

kstest = KolmogorovSmirnov(
Expand Down

0 comments on commit eca5bc2

Please sign in to comment.