diff --git a/scoringrules/_brier.py b/scoringrules/_brier.py index 554f0f2..210dcad 100644 --- a/scoringrules/_brier.py +++ b/scoringrules/_brier.py @@ -10,7 +10,6 @@ def brier_score( obs: "ArrayLike", fct: "ArrayLike", - /, *, backend: "Backend" = None, ) -> "Array": @@ -45,7 +44,6 @@ def brier_score( def rps_score( obs: "ArrayLike", fct: "ArrayLike", - /, k_axis: int = -1, *, backend: "Backend" = None, @@ -93,7 +91,6 @@ def rps_score( def log_score( obs: "ArrayLike", fct: "ArrayLike", - /, *, backend: "Backend" = None, ) -> "Array": @@ -128,7 +125,6 @@ def log_score( def rls_score( obs: "ArrayLike", fct: "ArrayLike", - /, k_axis: int = -1, *, backend: "Backend" = None, diff --git a/scoringrules/_crps.py b/scoringrules/_crps.py index 62e806e..e3602d3 100644 --- a/scoringrules/_crps.py +++ b/scoringrules/_crps.py @@ -10,7 +10,6 @@ def crps_ensemble( obs: "ArrayLike", fct: "Array", - /, m_axis: int = -1, *, sorted_ensemble: bool = False, @@ -124,7 +123,6 @@ def crps_ensemble( def twcrps_ensemble( obs: "ArrayLike", fct: "Array", - /, a: float = float("-inf"), b: float = float("inf"), m_axis: int = -1, @@ -225,7 +223,6 @@ def v_func(x): def owcrps_ensemble( obs: "ArrayLike", fct: "Array", - /, a: float = float("-inf"), b: float = float("inf"), m_axis: int = -1, @@ -327,7 +324,6 @@ def w_func(x): def vrcrps_ensemble( obs: "ArrayLike", fct: "Array", - /, a: float = float("-inf"), b: float = float("inf"), m_axis: int = -1, @@ -427,7 +423,6 @@ def crps_quantile( obs: "ArrayLike", fct: "Array", alpha: "Array", - /, m_axis: int = -1, *, backend: "Backend" = None, @@ -496,7 +491,6 @@ def crps_beta( obs: "ArrayLike", a: "ArrayLike", b: "ArrayLike", - /, lower: "ArrayLike" = 0.0, upper: "ArrayLike" = 1.0, *, @@ -560,7 +554,6 @@ def crps_binomial( obs: "ArrayLike", n: "ArrayLike", prob: "ArrayLike", - /, *, backend: "Backend" = None, ) -> "ArrayLike": @@ -610,7 +603,6 @@ def crps_binomial( def crps_exponential( obs: "ArrayLike", rate: "ArrayLike", - /, *, backend: "Backend" = None, ) -> "ArrayLike": @@ -658,7 +650,6 @@ def crps_exponential( def crps_exponentialM( obs: "ArrayLike", - /, mass: "ArrayLike" = 0.0, location: "ArrayLike" = 0.0, scale: "ArrayLike" = 1.0, @@ -724,7 +715,6 @@ def crps_2pexponential( scale1: "ArrayLike", scale2: "ArrayLike", location: "ArrayLike", - /, *, backend: "Backend" = None, ) -> "ArrayLike": @@ -778,7 +768,6 @@ def crps_2pexponential( def crps_gamma( obs: "ArrayLike", shape: "ArrayLike", - /, rate: "ArrayLike | None" = None, *, scale: "ArrayLike | None" = None, @@ -848,7 +837,6 @@ def crps_gamma( def crps_csg0( obs: "ArrayLike", - /, shape: "ArrayLike", rate: "ArrayLike | None" = None, *, @@ -926,7 +914,6 @@ def crps_csg0( def crps_gev( obs: "ArrayLike", shape: "ArrayLike", - /, location: "ArrayLike" = 0.0, scale: "ArrayLike" = 1.0, *, @@ -1021,7 +1008,6 @@ def crps_gev( def crps_gpd( obs: "ArrayLike", shape: "ArrayLike", - /, location: "ArrayLike" = 0.0, scale: "ArrayLike" = 1.0, mass: "ArrayLike" = 0.0, @@ -1085,7 +1071,6 @@ def crps_gtclogistic( obs: "ArrayLike", location: "ArrayLike", scale: "ArrayLike", - /, lower: "ArrayLike" = float("-inf"), upper: "ArrayLike" = float("inf"), lmass: "ArrayLike" = 0.0, @@ -1166,7 +1151,6 @@ def crps_tlogistic( obs: "ArrayLike", location: "ArrayLike", scale: "ArrayLike", - /, lower: "ArrayLike" = float("-inf"), upper: "ArrayLike" = float("inf"), *, @@ -1210,7 +1194,6 @@ def crps_clogistic( obs: "ArrayLike", location: "ArrayLike", scale: "ArrayLike", - /, lower: "ArrayLike" = float("-inf"), upper: "ArrayLike" = float("inf"), *, @@ -1263,7 +1246,6 @@ def crps_gtcnormal( obs: "ArrayLike", location: "ArrayLike", scale: "ArrayLike", - /, lower: "ArrayLike" = float("-inf"), upper: "ArrayLike" = float("inf"), lmass: "ArrayLike" = 0.0, @@ -1319,7 +1301,6 @@ def crps_tnormal( obs: "ArrayLike", location: "ArrayLike", scale: "ArrayLike", - /, lower: "ArrayLike" = float("-inf"), upper: "ArrayLike" = float("inf"), *, @@ -1361,7 +1342,6 @@ def crps_cnormal( obs: "ArrayLike", location: "ArrayLike", scale: "ArrayLike", - /, lower: "ArrayLike" = float("-inf"), upper: "ArrayLike" = float("inf"), *, @@ -1413,7 +1393,6 @@ def crps_cnormal( def crps_gtct( obs: "ArrayLike", df: "ArrayLike", - /, location: "ArrayLike" = 0.0, scale: "ArrayLike" = 1.0, lower: "ArrayLike" = float("-inf"), @@ -1501,7 +1480,6 @@ def crps_gtct( def crps_tt( obs: "ArrayLike", df: "ArrayLike", - /, location: "ArrayLike" = 0.0, scale: "ArrayLike" = 1.0, lower: "ArrayLike" = float("-inf"), @@ -1556,7 +1534,6 @@ def crps_tt( def crps_ct( obs: "ArrayLike", df: "ArrayLike", - /, location: "ArrayLike" = 0.0, scale: "ArrayLike" = 1.0, lower: "ArrayLike" = float("-inf"), @@ -1615,7 +1592,6 @@ def crps_hypergeometric( m: "ArrayLike", n: "ArrayLike", k: "ArrayLike", - /, *, backend: "Backend" = None, ) -> "ArrayLike": @@ -1667,7 +1643,6 @@ def crps_hypergeometric( def crps_laplace( obs: "ArrayLike", - /, location: "ArrayLike" = 0.0, scale: "ArrayLike" = 1.0, *, @@ -1720,7 +1695,6 @@ def crps_logistic( obs: "ArrayLike", mu: "ArrayLike", sigma: "ArrayLike", - /, *, backend: "Backend" = None, ) -> "ArrayLike": @@ -1938,7 +1912,6 @@ def crps_mixnorm( obs: "ArrayLike", m: "ArrayLike", s: "ArrayLike", - /, w: "ArrayLike" = None, m_axis: "ArrayLike" = -1, *, @@ -2007,7 +1980,6 @@ def crps_mixnorm( def crps_negbinom( obs: "ArrayLike", n: "ArrayLike", - /, prob: "ArrayLike | None" = None, *, mu: "ArrayLike | None" = None, @@ -2072,7 +2044,6 @@ def crps_normal( obs: "ArrayLike", mu: "ArrayLike", sigma: "ArrayLike", - /, *, backend: "Backend" = None, ) -> "ArrayLike": @@ -2120,7 +2091,6 @@ def crps_2pnormal( scale1: "ArrayLike", scale2: "ArrayLike", location: "ArrayLike", - /, *, backend: "Backend" = None, ) -> "ArrayLike": @@ -2190,7 +2160,6 @@ def crps_2pnormal( def crps_poisson( obs: "ArrayLike", mean: "ArrayLike", - /, *, backend: "Backend" = None, ) -> "ArrayLike": @@ -2236,7 +2205,6 @@ def crps_poisson( def crps_t( obs: "ArrayLike", df: "ArrayLike", - /, location: "ArrayLike" = 0.0, scale: "ArrayLike" = 1.0, *, @@ -2293,7 +2261,6 @@ def crps_uniform( obs: "ArrayLike", min: "ArrayLike", max: "ArrayLike", - /, lmass: "ArrayLike" = 0.0, umass: "ArrayLike" = 0.0, *, diff --git a/scoringrules/_dss.py b/scoringrules/_dss.py index 391b38c..299c7a4 100644 --- a/scoringrules/_dss.py +++ b/scoringrules/_dss.py @@ -11,7 +11,6 @@ def dssuv_ensemble( obs: "Array", fct: "Array", - /, m_axis: int = -1, *, bias: bool = False, @@ -61,7 +60,6 @@ def dssuv_ensemble( def dssmv_ensemble( obs: "Array", fct: "Array", - /, m_axis: int = -2, v_axis: int = -1, *, diff --git a/scoringrules/_energy.py b/scoringrules/_energy.py index 263deec..4ff2231 100644 --- a/scoringrules/_energy.py +++ b/scoringrules/_energy.py @@ -11,7 +11,6 @@ def es_ensemble( obs: "Array", fct: "Array", - /, m_axis: int = -2, v_axis: int = -1, *, @@ -80,7 +79,6 @@ def twes_ensemble( obs: "Array", fct: "Array", v_func: tp.Callable[["ArrayLike"], "ArrayLike"], - /, m_axis: int = -2, v_axis: int = -1, *, @@ -134,7 +132,6 @@ def owes_ensemble( obs: "Array", fct: "Array", w_func: tp.Callable[["ArrayLike"], "ArrayLike"], - /, m_axis: int = -2, v_axis: int = -1, *, @@ -195,7 +192,6 @@ def vres_ensemble( obs: "Array", fct: "Array", w_func: tp.Callable[["ArrayLike"], "ArrayLike"], - /, *, m_axis: int = -2, v_axis: int = -1, diff --git a/scoringrules/_error_spread.py b/scoringrules/_error_spread.py index e712c6b..4d4566d 100644 --- a/scoringrules/_error_spread.py +++ b/scoringrules/_error_spread.py @@ -10,7 +10,6 @@ def error_spread_score( observations: "ArrayLike", forecasts: "Array", - /, m_axis: int = -1, *, backend: "Backend" = None, diff --git a/scoringrules/_interval.py b/scoringrules/_interval.py index ce742fb..d6d7492 100644 --- a/scoringrules/_interval.py +++ b/scoringrules/_interval.py @@ -113,7 +113,6 @@ def weighted_interval_score( lower: "Array", upper: "Array", alpha: "Array", - /, w_median: Optional[float] = None, w_alpha: Optional["Array"] = None, *, diff --git a/scoringrules/_kernels.py b/scoringrules/_kernels.py index c78e923..bae2dbb 100644 --- a/scoringrules/_kernels.py +++ b/scoringrules/_kernels.py @@ -11,7 +11,6 @@ def gksuv_ensemble( obs: "ArrayLike", fct: "Array", - /, m_axis: int = -1, *, estimator: str = "nrg", @@ -78,7 +77,6 @@ def gksuv_ensemble( def twgksuv_ensemble( obs: "ArrayLike", fct: "Array", - /, a: float = float("-inf"), b: float = float("inf"), m_axis: int = -1, @@ -161,7 +159,6 @@ def v_func(x): def owgksuv_ensemble( obs: "ArrayLike", fct: "Array", - /, a: float = float("-inf"), b: float = float("inf"), m_axis: int = -1, @@ -245,7 +242,6 @@ def w_func(x): def vrgksuv_ensemble( obs: "ArrayLike", fct: "Array", - /, a: float = float("-inf"), b: float = float("inf"), m_axis: int = -1, @@ -328,7 +324,6 @@ def w_func(x): def gksmv_ensemble( obs: "Array", fct: "Array", - /, m_axis: int = -2, v_axis: int = -1, *, @@ -395,7 +390,6 @@ def twgksmv_ensemble( obs: "Array", fct: "Array", v_func: tp.Callable[["ArrayLike"], "ArrayLike"], - /, m_axis: int = -2, v_axis: int = -1, *, @@ -447,7 +441,6 @@ def owgksmv_ensemble( obs: "Array", fct: "Array", w_func: tp.Callable[["ArrayLike"], "ArrayLike"], - /, m_axis: int = -2, v_axis: int = -1, *, @@ -523,7 +516,6 @@ def vrgksmv_ensemble( obs: "Array", fct: "Array", w_func: tp.Callable[["ArrayLike"], "ArrayLike"], - /, *, m_axis: int = -2, v_axis: int = -1, diff --git a/scoringrules/_logs.py b/scoringrules/_logs.py index 6b5f96d..d153d83 100644 --- a/scoringrules/_logs.py +++ b/scoringrules/_logs.py @@ -10,7 +10,6 @@ def logs_ensemble( obs: "ArrayLike", fct: "Array", - /, m_axis: int = -1, *, bw: "ArrayLike" = None, @@ -75,7 +74,6 @@ def logs_ensemble( def clogs_ensemble( obs: "ArrayLike", fct: "Array", - /, a: "ArrayLike" = float("-inf"), b: "ArrayLike" = float("inf"), m_axis: int = -1, @@ -158,7 +156,6 @@ def logs_beta( obs: "ArrayLike", a: "ArrayLike", b: "ArrayLike", - /, lower: "ArrayLike" = 0.0, upper: "ArrayLike" = 1.0, *, @@ -200,7 +197,6 @@ def logs_binomial( obs: "ArrayLike", n: "ArrayLike", prob: "ArrayLike", - /, *, backend: "Backend" = None, ) -> "ArrayLike": @@ -235,7 +231,6 @@ def logs_binomial( def logs_exponential( obs: "ArrayLike", rate: "ArrayLike", - /, *, backend: "Backend" = None, ) -> "ArrayLike": @@ -267,7 +262,6 @@ def logs_exponential( def logs_exponential2( obs: "ArrayLike", - /, location: "ArrayLike" = 0.0, scale: "ArrayLike" = 1.0, *, @@ -306,7 +300,6 @@ def logs_2pexponential( scale1: "ArrayLike", scale2: "ArrayLike", location: "ArrayLike", - /, *, backend: "Backend" = None, ) -> "ArrayLike": @@ -343,7 +336,6 @@ def logs_2pexponential( def logs_gamma( obs: "ArrayLike", shape: "ArrayLike", - /, rate: "ArrayLike | None" = None, *, scale: "ArrayLike | None" = None, @@ -393,7 +385,6 @@ def logs_gamma( def logs_gev( obs: "ArrayLike", shape: "ArrayLike", - /, location: "ArrayLike" = 0.0, scale: "ArrayLike" = 1.0, *, @@ -432,7 +423,6 @@ def logs_gev( def logs_gpd( obs: "ArrayLike", shape: "ArrayLike", - /, location: "ArrayLike" = 0.0, scale: "ArrayLike" = 1.0, *, @@ -474,7 +464,6 @@ def logs_hypergeometric( m: "ArrayLike", n: "ArrayLike", k: "ArrayLike", - /, *, backend: "Backend" = None, ) -> "ArrayLike": @@ -512,7 +501,6 @@ def logs_laplace( obs: "ArrayLike", location: "ArrayLike" = 0.0, scale: "ArrayLike" = 1.0, - /, *, backend: "Backend" = None, ) -> "ArrayLike": @@ -581,7 +569,6 @@ def logs_logistic( obs: "ArrayLike", mu: "ArrayLike", sigma: "ArrayLike", - /, *, backend: "Backend" = None, ) -> "ArrayLike": @@ -681,7 +668,6 @@ def logs_mixnorm( obs: "ArrayLike", m: "ArrayLike", s: "ArrayLike", - /, w: "ArrayLike" = None, mc_axis: "ArrayLike" = -1, *, @@ -736,7 +722,6 @@ def logs_mixnorm( def logs_negbinom( obs: "ArrayLike", n: "ArrayLike", - /, prob: "ArrayLike | None" = None, *, mu: "ArrayLike | None" = None, @@ -787,7 +772,6 @@ def logs_normal( obs: "ArrayLike", mu: "ArrayLike", sigma: "ArrayLike", - /, *, negative: bool = True, backend: "Backend" = None, @@ -825,7 +809,6 @@ def logs_2pnormal( scale1: "ArrayLike", scale2: "ArrayLike", location: "ArrayLike", - /, *, backend: "Backend" = None, ) -> "ArrayLike": @@ -861,7 +844,6 @@ def logs_2pnormal( def logs_poisson( obs: "ArrayLike", mean: "ArrayLike", - /, *, backend: "Backend" = None, ) -> "ArrayLike": @@ -894,7 +876,6 @@ def logs_poisson( def logs_t( obs: "ArrayLike", df: "ArrayLike", - /, location: "ArrayLike" = 0.0, scale: "ArrayLike" = 1.0, *, @@ -932,7 +913,6 @@ def logs_tlogistic( obs: "ArrayLike", location: "ArrayLike", scale: "ArrayLike", - /, lower: "ArrayLike" = float("-inf"), upper: "ArrayLike" = float("inf"), *, @@ -972,7 +952,6 @@ def logs_tnormal( obs: "ArrayLike", location: "ArrayLike", scale: "ArrayLike", - /, lower: "ArrayLike" = float("-inf"), upper: "ArrayLike" = float("inf"), *, @@ -1011,7 +990,6 @@ def logs_tnormal( def logs_tt( obs: "ArrayLike", df: "ArrayLike", - /, location: "ArrayLike" = 0.0, scale: "ArrayLike" = 1.0, lower: "ArrayLike" = float("-inf"), @@ -1055,7 +1033,6 @@ def logs_uniform( obs: "ArrayLike", min: "ArrayLike", max: "ArrayLike", - /, *, backend: "Backend" = None, ) -> "ArrayLike": diff --git a/scoringrules/_quantile.py b/scoringrules/_quantile.py index ed324d7..7f049f2 100644 --- a/scoringrules/_quantile.py +++ b/scoringrules/_quantile.py @@ -10,6 +10,7 @@ def quantile_score( obs: "ArrayLike", fct: "ArrayLike", alpha: "ArrayLike", + *, backend: "Backend | None" = None, ) -> "Array": r"""Compute the quantile score for a given quantile level. diff --git a/scoringrules/_variogram.py b/scoringrules/_variogram.py index fb2b118..4ff690c 100644 --- a/scoringrules/_variogram.py +++ b/scoringrules/_variogram.py @@ -11,7 +11,6 @@ def vs_ensemble( obs: "Array", fct: "Array", - /, m_axis: int = -2, v_axis: int = -1, *, @@ -84,7 +83,6 @@ def twvs_ensemble( obs: "Array", fct: "Array", v_func: tp.Callable, - /, m_axis: int = -2, v_axis: int = -1, *, @@ -155,7 +153,6 @@ def owvs_ensemble( obs: "Array", fct: "Array", w_func: tp.Callable, - /, m_axis: int = -2, v_axis: int = -1, *, @@ -230,7 +227,6 @@ def vrvs_ensemble( obs: "Array", fct: "Array", w_func: tp.Callable, - /, m_axis: int = -2, v_axis: int = -1, *, diff --git a/tests/test_wvariogram.py b/tests/test_wvariogram.py index 3c4c1dc..51fda41 100644 --- a/tests/test_wvariogram.py +++ b/tests/test_wvariogram.py @@ -44,7 +44,7 @@ def test_vrvs_vs_vs(backend): lambda x: backends[backend].mean(x) * 0.0 + 1.0, backend=backend, ) - np.testing.assert_allclose(res, resw, atol=1e-6) + np.testing.assert_allclose(res, resw, atol=1e-5) def test_owvariogram_score_correctness(backend):