some more clean-up

Author: gykovacs

mlscorecheck/check/bundles/retina/_drishti_gs.py

@@ -144,7 +144,7 @@ def check_drishti_gs_segmentation_aggregated_mos(
     timeout: int | None = None,
     verbosity: int = 1,
     numerical_tolerance: float = NUMERICAL_TOLERANCE,
-):
+) -> dict:
     """
     Testing the scores shared for a set of images with the MoS aggregation.
 
@@ -212,7 +212,7 @@ def check_drishti_gs_segmentation_aggregated_som(
     eps: float,
     *,
     numerical_tolerance: float = NUMERICAL_TOLERANCE,
-):
+) -> dict:
     """
     Testing the scores shared for a set of images with the SoM aggregation.
 
@@ -281,7 +281,7 @@ def check_drishti_gs_segmentation_aggregated(
     timeout: int | None = None,
     verbosity: int = 1,
     numerical_tolerance: float = NUMERICAL_TOLERANCE,
-):
+) -> dict:
     """
     Testing the scores shared for a set of images with both the MoS and SoM aggregations.
 

mlscorecheck/check/bundles/retina/_drive.py

@@ -122,14 +122,14 @@ def check_drive_vessel_aggregated_mos_assumption(
 
 
 def check_drive_vessel_aggregated_som_assumption(
-    imageset,
+    imageset: str | list,
     assumption: str,
     annotator: int,
     scores: dict,
-    eps,
+    eps: float | dict,
     *,
-    numerical_tolerance=NUMERICAL_TOLERANCE,
-):
+    numerical_tolerance: float = NUMERICAL_TOLERANCE,
+) -> dict:
     """
     Tests the consistency of scores calculated on the DRIVE dataset using
     the score of means aggregation and a particular assumption on the region
@@ -192,10 +192,10 @@ def check_drive_vessel_image_assumption(
     assumption: str,
     annotator: str,
     scores: dict,
-    eps,
+    eps: float | dict,
     *,
     numerical_tolerance: float = NUMERICAL_TOLERANCE,
-):
+) -> dict:
     """
     Testing the scores calculated for one image of the DRIVE dataset with a particular
     assumption on the region of evaluation.
@@ -359,10 +359,10 @@ def check_drive_vessel_image(
     image_identifier: str,
     annotator: str,
     scores: dict,
-    eps,
+    eps: float | dict,
     *,
     numerical_tolerance: float = NUMERICAL_TOLERANCE,
-):
+) -> dict:
     """
     Testing the scores calculated for one image of the DRIVE dataset with
     both assumptions on the region of evaluation ('fov'/'all').

mlscorecheck/individual/_check_scores_tptn.py

@@ -322,7 +322,7 @@ def check_any_zero_division(sols: list) -> bool:
     return any(sol.get("message") == "zero division" for sol in sols)
 
 
-def update_tptn(tp, tn, sols: list):
+def update_tptn(tp: Interval | IntervalUnion, tn: Interval | IntervalUnion, sols: list) -> tuple[Interval | IntervalUnion, Interval | IntervalUnion]:
     """
     Updates the tp and tn intervals based on the solutions
 

mlscorecheck/individual/_interval.py

@@ -318,7 +318,7 @@ def __repr__(self) -> str:
         """
         return str(f"({str(self.lower_bound)}, {str(self.upper_bound)})")
 
-    def __eq__(self, other) -> bool:
+    def __eq__(self, other: object) -> bool:
         """
         Equality operator
 
@@ -332,7 +332,7 @@ def __eq__(self, other) -> bool:
             return False
         return bool(self.lower_bound == other.lower_bound and self.upper_bound == other.upper_bound)
 
-    def __ne__(self, other) -> bool:
+    def __ne__(self, other: object) -> bool:
         """
         Non-equality operator
 
@@ -476,7 +476,7 @@ def simplify(self) -> None:
 
         self.intervals = final_intervals
 
-    def contains(self, value) -> bool:
+    def contains(self, value: float | int) -> bool:
         """
         Check if the interval contains the value
 
@@ -488,7 +488,7 @@ def contains(self, value) -> bool:
         """
         return any(interval.contains(value) for interval in self.intervals)
 
-    def intersection(self, other):
+    def intersection(self, other: "Interval | IntervalUnion") -> "IntervalUnion":
         """
         Returns the intersection of two intervals
 
@@ -521,7 +521,7 @@ def integer(self) -> bool:
 
         return any(interval.integer() for interval in self.intervals)
 
-    def shrink_to_integers(self):
+    def shrink_to_integers(self) -> "IntervalUnion":
         """
         Shrinking the interval to integer boundaries
 
@@ -550,7 +550,7 @@ def is_empty(self) -> bool:
             return True
         return all(interval.is_empty() for interval in self.intervals)
 
-    def __add__(self, other):
+    def __add__(self, other: "int | float | Interval | IntervalUnion") -> "IntervalUnion":
         """
         The addition operator
 
@@ -569,7 +569,7 @@ def __add__(self, other):
 
         return IntervalUnion(intervals)
 
-    def __radd__(self, other):
+    def __radd__(self, other: "int | float | Interval | IntervalUnion") -> "IntervalUnion":
         """
         The right hand addition
 
@@ -581,7 +581,7 @@ def __radd__(self, other):
         """
         return self + other
 
-    def __sub__(self, other):
+    def __sub__(self, other: "int | float | Interval | IntervalUnion") -> "IntervalUnion":
         """
         The subtraction operator
 
@@ -601,7 +601,7 @@ def __sub__(self, other):
 
         return IntervalUnion(intervals)
 
-    def __rsub__(self, other):
+    def __rsub__(self, other: "int | float | Interval | IntervalUnion") -> "IntervalUnion":
         """
         The right hand subtraction
 
@@ -613,7 +613,7 @@ def __rsub__(self, other):
         """
         return -1 * self + other
 
-    def __mul__(self, other):
+    def __mul__(self, other: "int | float | Interval | IntervalUnion") -> "IntervalUnion":
         """
         The multiplication operator
 
@@ -634,7 +634,7 @@ def __mul__(self, other):
 
         return IntervalUnion(intervals)
 
-    def __rmul__(self, other):
+    def __rmul__(self, other: "int | float | Interval | IntervalUnion") -> "IntervalUnion":
         """
         The right hand multiplication operator
 
@@ -646,7 +646,7 @@ def __rmul__(self, other):
         """
         return self.__mul__(other)
 
-    def __truediv__(self, other):
+    def __truediv__(self, other: "int | float | Interval | IntervalUnion") -> "IntervalUnion":
         """
         The division operator
 
@@ -678,7 +678,7 @@ def __truediv__(self, other):
 
         return IntervalUnion(intervals)
 
-    def __rtruediv__(self, other):
+    def __rtruediv__(self, other: "int | float | Interval | IntervalUnion") -> "IntervalUnion":
         """
         The right hand division operator
 
@@ -696,7 +696,7 @@ def __rtruediv__(self, other):
 
         return other / self
 
-    def __neg__(self):
+    def __neg__(self) -> "IntervalUnion":
         """
         The negation operator
 
@@ -716,7 +716,7 @@ def __repr__(self) -> str:
             [f"({interval.lower_bound}, {interval.upper_bound})" for interval in self.intervals]
         )
 
-    def __eq__(self, other) -> bool:
+    def __eq__(self, other: object) -> bool:
         """
         Equality operator
 
@@ -740,7 +740,7 @@ def __eq__(self, other) -> bool:
 
         return True
 
-    def __ne__(self, other) -> bool:
+    def __ne__(self, other: object) -> bool:
         """
         Non-equality operator
 
@@ -752,7 +752,7 @@ def __ne__(self, other) -> bool:
         """
         return not self.__eq__(other)
 
-    def __pow__(self, other):
+    def __pow__(self, other: float | int) -> "IntervalUnion":
         """
         The power operation on the interval union
 
@@ -764,7 +764,7 @@ def __pow__(self, other):
         """
         return IntervalUnion([interval**other for interval in self.intervals])
 
-    def representing_int(self):
+    def representing_int(self) -> int | None:
         """
         Returns a representative integer
 

mlscorecheck/individual/_problem_generator.py

@@ -12,14 +12,13 @@
     "generate_problem_and_scores",
     "generate_multiclass_dataset",
     "sample_multiclass_dataset",
-    "create_confusion_matrix",
-]
+    "create_confusion_matrix",]
 
 
 def generate_problem_and_scores(
     rounding_decimals: int = 4,
     *,
-    random_state=None,
+    random_state: int | np.random.RandomState | None = None,
     p_bounds: tuple[int, int] = (10, 100),
     n_bounds: tuple[int, int] = (10, 100),
     available_scores: list | None = None,
@@ -60,7 +59,7 @@ def generate_1_problem(
     max_n: int = 1000,
     zeros: list | None = None,
     add_complements: bool = False,
-    random_state=None,
+    random_state: int | None = None,
 ) -> tuple[dict, dict]:
     """
     Generates a random problem

mlscorecheck/symbolic/_sage_algebra.py

@@ -8,6 +8,7 @@
 __all__ = ["SageAlgebra"]
 
 import importlib
+from typing import Any
 
 from ._algebra import Algebra
 
@@ -17,7 +18,7 @@ class SageAlgebra(Algebra):  # pragma: no cover
     The required algebra driven by sage
     """
 
-    def __init__(self):  # pragma: no cover
+    def __init__(self) -> None:  # pragma: no cover
         """
         Constructor of the algebra
         """
@@ -26,7 +27,7 @@ def __init__(self):  # pragma: no cover
         self.algebra = importlib.import_module("sage.all")  # pragma: no cover
         self.sqrt = self.algebra.sqrt  # pragma: no cover
 
-    def create_symbol(self, name, **kwargs):  # pragma: no cover
+    def create_symbol(self, name: str, **kwargs) -> Any:  # pragma: no cover
         """
         Create a symbol in the algebra with the specified name and assumptions
 
@@ -55,7 +56,7 @@ def create_symbol(self, name, **kwargs):  # pragma: no cover
 
         return var  # pragma: no cover
 
-    def num_denom(self, expression):  # pragma: no cover
+    def num_denom(self, expression: Any) -> tuple[Any, Any]:  # pragma: no cover
         """
         Extract the numerator and denominator
 
@@ -67,7 +68,7 @@ def num_denom(self, expression):  # pragma: no cover
         """
         return expression.numerator(), expression.denominator()  # pragma: no cover
 
-    def simplify(self, expression):  # pragma: no cover
+    def simplify(self, expression: Any) -> Any:  # pragma: no cover
         """
         Simplify the expression
 
@@ -79,7 +80,7 @@ def simplify(self, expression):  # pragma: no cover
         """
         return self.algebra.factor(expression)  # pragma: no cover
 
-    def solve(self, equation, var, **kwargs):  # pragma: no cover
+    def solve(self, equation: Any, var: Any, **kwargs) -> list[dict]:  # pragma: no cover
         """
         Solve an equation for a variable
 
@@ -98,7 +99,7 @@ def solve(self, equation, var, **kwargs):  # pragma: no cover
             solutions.append(solution)  # pragma: no cover
         return solutions  # pragma: no cover
 
-    def subs(self, expression, subs_dict):  # pragma: no cover
+    def subs(self, expression: Any, subs_dict: dict) -> Any:  # pragma: no cover
         """
         Substitute a substitution into the expression
 
@@ -123,7 +124,7 @@ def args(self, expression) -> list:  # pragma: no cover
         """
         return list(expression.args())  # pragma: no cover
 
-    def is_trivial(self, expression) -> bool:  # pragma: no cover
+    def is_trivial(self, expression: Any) -> bool:  # pragma: no cover
         """
         Checks if the expression is trivial
 
@@ -135,7 +136,7 @@ def is_trivial(self, expression) -> bool:  # pragma: no cover
         """
         return True if expression is None else expression.is_trivially_equal(1)  # pragma: no cover
 
-    def is_root(self, expression) -> bool:  # pragma: no cover
+    def is_root(self, expression: Any) -> bool:  # pragma: no cover
         """
         Checks if the expression is a root
 
@@ -151,7 +152,7 @@ def is_root(self, expression) -> bool:  # pragma: no cover
                 return True  # pragma: no cover
         return False  # pragma: no cover
 
-    def is_power(self, expression) -> bool:  # pragma: no cover
+    def is_power(self, expression: Any) -> bool:  # pragma: no cover
         """
         Checks whether the expression is a power
 
@@ -166,7 +167,7 @@ def is_power(self, expression) -> bool:  # pragma: no cover
             and expression.operator().__qualname__ == "pow"
         )  # pragma: no cover
 
-    def is_division(self, expression) -> bool:  # pragma: no cover
+    def is_division(self, expression: Any) -> bool:  # pragma: no cover
         """
         Checks whether the expression is a division
 
@@ -198,7 +199,7 @@ def is_division(self, expression) -> bool:  # pragma: no cover
                         return True  # pragma: no cover
         return False  # pragma: no cover
 
-    def operands(self, expression) -> list:  # pragma: no cover
+    def operands(self, expression: Any) -> list:  # pragma: no cover
         """
         Returns the list of operands
 
@@ -210,7 +211,7 @@ def operands(self, expression) -> list:  # pragma: no cover
         """
         return list(expression.operands())  # pragma: no cover
 
-    def free_symbols(self, expression) -> list:  # pragma: no cover
+    def free_symbols(self, expression: Any) -> list:  # pragma: no cover
         """
         Get all free symbols in an expression