fixes to EVA.test_ks method

georgebv · Jun 18, 2023 · d0d7c83 · d0d7c83
1 parent 1f71bd2
commit d0d7c83
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/pyextremes/eva.py b/src/pyextremes/eva.py
@@ -217,9 +217,15 @@ def AIC(self) -> float:
 
     def test_ks(self, significance_level: float = 0.05) -> KolmogorovSmirnov:
         return KolmogorovSmirnov(
-            extremes=self.extremes,
+            extremes=self.extremes_transformer.transformed_extremes,
             distribution=self.distribution.distribution,
-            fit_parameters=self.model.fit_parameters,
+            fit_parameters={
+                **self.model.fit_parameters,
+                **{
+                    'loc' if k=='floc' else
+                    k: v for k, v in model.distribution.fixed_parameters.items()
+                }
+            },
             significance_level=significance_level,
         )
 

diff --git a/src/pyextremes/tests/test_base.py b/src/pyextremes/tests/test_base.py
@@ -26,7 +26,7 @@ def __init__(
             See https://docs.scipy.org/doc/scipy/reference/stats.html
         fit_parameters : dict
             Dictionary with fit parameters passed to the `distribution` '.cdf' method.
-            E.g. {"c": 0.3, loc: 10, "scale": 2} for `distribution`
+            E.g. {"c": 0.3, "loc": 10, "scale": 2} for `distribution`
             with shape, location, and scale parameters.
         significance_level : float, optional
             Significance level in the range (0, 1).

diff --git a/tests/integration/test_eva.py b/tests/integration/test_eva.py
@@ -592,7 +592,4 @@ def test_test_ks(self, eva_model_bm_mle, eva_model_pot_mle, extremes_method):
             "POT": eva_model_pot_mle,
         }[extremes_method]
         assert isinstance(eva_model.test_ks(), KolmogorovSmirnov)
-        if extremes_method == "BM":
-            assert eva_model.test_ks().success
-        else:
-            assert eva_model.test_ks().success
+        assert eva_model.test_ks().success