some more cleanup

Author: gykovacs

mlscorecheck/check/binary/_check_1_dataset_kfold_som.py

@@ -23,7 +23,7 @@ def check_1_dataset_kfold_som(
     dataset: dict,
     folding: dict,
     scores: dict,
-    eps,
+    eps: float | dict,
     *,
     numerical_tolerance: float = NUMERICAL_TOLERANCE,
     prefilter_by_pairs: bool = True,

mlscorecheck/check/bundles/ehg/_tpehg.py

@@ -11,7 +11,7 @@
 
 def check_tpehg(
     scores: dict,
-    eps,
+    eps: float | dict,
     n_folds: int,
     n_repeats: int,
     *,

mlscorecheck/check/bundles/retina/_chasedb1.py

@@ -19,7 +19,7 @@
 ]
 
 
-def _filter_chasedb1(data: dict, imageset, annotator: str) -> list:
+def _filter_chasedb1(data: dict, imageset: str | list, annotator: str) -> list:
     """
     Filters the CHASEDB1 dataset
 
@@ -38,10 +38,10 @@ def _filter_chasedb1(data: dict, imageset, annotator: str) -> list:
 
 
 def check_chasedb1_vessel_aggregated_mos(
-    imageset,
+    imageset: str | list,
     annotator: str,
     scores: dict,
-    eps,
+    eps: float | dict,
     *,
     score_bounds: dict | None = None,
     solver_name: str | None = None,
@@ -107,7 +107,7 @@ def check_chasedb1_vessel_aggregated_mos(
 
 
 def check_chasedb1_vessel_aggregated_som(
-    imageset, annotator: str, scores: dict, eps, numerical_tolerance=NUMERICAL_TOLERANCE
+    imageset: str | list, annotator: str, scores: dict, eps: float | dict, numerical_tolerance: float = NUMERICAL_TOLERANCE
 ) -> dict:
     """
     Tests the consistency of scores calculated on the CHASEDB1 dataset using

mlscorecheck/check/bundles/retina/_stare.py

@@ -111,7 +111,7 @@ def check_stare_vessel_aggregated_mos(
 
 
 def check_stare_vessel_aggregated_som(
-    imageset, annotator: str, scores: dict, eps, numerical_tolerance=NUMERICAL_TOLERANCE
+    imageset: str | list, annotator: str, scores: dict, eps: float | dict, numerical_tolerance: float = NUMERICAL_TOLERANCE
 ) -> dict:
     """
     Tests the consistency of scores calculated on the STARE dataset using
@@ -172,10 +172,10 @@ def check_stare_vessel_aggregated_som(
 
 
 def check_stare_vessel_aggregated(
-    imageset,
+    imageset: str | list,
     annotator: str,
     scores: dict,
-    eps,
+    eps: float | dict,
     *,
     score_bounds: dict | None = None,
     solver_name: str | None = None,
@@ -254,7 +254,7 @@ def check_stare_vessel_image(
     image_identifier: str,
     annotator: str,
     scores: dict,
-    eps,
+    eps: float | dict,
     *,
     numerical_tolerance: float = NUMERICAL_TOLERANCE,
 ) -> dict:

mlscorecheck/check/regression/_check_regression.py

@@ -113,7 +113,7 @@ def calculate_regression_scores(
 
 
 def generate_regression_problem_and_scores(
-    random_state=None, max_n_samples=1000, subset=None, rounding_decimals=None
+    random_state: int | None = None, max_n_samples: int = 1000, subset: list | None = None, rounding_decimals: int | None = None
 ) -> tuple[float, int, dict]:
     """
     Generate a regression problem and corresponding scores
@@ -150,7 +150,7 @@ def generate_regression_problem_and_scores(
 
 
 def expand_regression_scores(
-    var: float, n_samples: int, scores: dict, eps, numerical_tolerance: float
+    var: float, n_samples: int, scores: dict, eps: float | dict, numerical_tolerance: float
 ) -> dict:
     """
     Generate scores from the ones available and expand the scores to intervals given the
@@ -214,7 +214,7 @@ def check_1_testset_no_kfold(
     var: float,
     n_samples: int,
     scores: dict,
-    eps,
+    eps: float | dict,
     numerical_tolerance: float = NUMERICAL_TOLERANCE,
 ) -> dict:
     """

mlscorecheck/individual/_check_scores_tptn.py

@@ -4,7 +4,7 @@
 """
 
 import copy
-from typing import Any
+from typing import Any, Callable
 
 from ..core import NUMERICAL_TOLERANCE, logger, update_uncertainty
 from ._interval import Interval, IntervalUnion
@@ -45,7 +45,7 @@
 
 
 def iterate_tptn(
-    *, score: str, score_value: float, valid_pairs: dict, sol_fun, params: dict, iterate_by: str
+    *, score: str, score_value: float, valid_pairs: dict, sol_fun: Callable, params: dict, iterate_by: str
 ) -> dict:
     """
     Iterate through the potential values of tp or tn and construct feasible pairs
@@ -110,7 +110,7 @@ def update_sens(p: int, valid_pairs: dict, score_int: "Interval", solve_for: str
     return valid_pairs
 
 
-def update_spec(n: int, valid_pairs: dict, score_int, solve_for: str) -> dict:
+def update_spec(n: int, valid_pairs: dict, score_int: Interval | IntervalUnion, solve_for: str) -> dict:
     """
     Update specificity intervals
 
@@ -175,7 +175,7 @@ def _check_scores_tptn_pairs(
     p: int,
     n: int,
     scores: dict,
-    eps,
+    eps: float | dict,
     *,
     numerical_tolerance: float = NUMERICAL_TOLERANCE,
     solve_for: str | None = None,
@@ -347,7 +347,7 @@ def update_tptn(tp: Interval | IntervalUnion, tn: Interval | IntervalUnion, sols
 
 
 def _check_scores_tptn_intervals(
-    p: int, n: int, scores: dict, eps, *, numerical_tolerance: float = NUMERICAL_TOLERANCE
+    p: int, n: int, scores: dict, eps: float | dict, *, numerical_tolerance: float = NUMERICAL_TOLERANCE
 ) -> dict:
     """
     Check scores by iteratively reducing the set of feasible ``tp``, ``tn`` pairs.
@@ -484,7 +484,7 @@ def check_scores_tptn_pairs(
     p: int,
     n: int,
     scores: dict,
-    eps,
+    eps: float | dict,
     *,
     numerical_tolerance: float = NUMERICAL_TOLERANCE,
     solve_for: str | None = None,

mlscorecheck/individual/_complex_interval.py

@@ -154,7 +154,7 @@ def __repr__(self) -> str:
         """
         return str(f"[{str(self.real)}, {str(self.imag)}]")
 
-    def __eq__(self, other) -> bool:
+    def __eq__(self, other: object) -> bool:
         """
         The equality operator
 
@@ -169,7 +169,7 @@ def __eq__(self, other) -> bool:
 
         return bool(self.real == other.real and self.imag == other.imag)
 
-    def __ne__(self, other) -> bool:
+    def __ne__(self, other: object) -> bool:
         """
         The non-equality operator
 

mlscorecheck/individual/_expression.py

@@ -20,7 +20,7 @@ class Expression:
     """
 
     def __init__(
-        self, expression: str, symbols: list, functional_symbols: list | None = None, **kwargs
+        self, expression: str, symbols: list, functional_symbols: list | None = None, **kwargs: dict
     ) -> None:
         """
         The constructor of the expression