some further clean-up

Author: gykovacs

mlscorecheck/check/bundles/retina/_diaretdb1.py

@@ -105,7 +105,7 @@ def _prepare_configuration_diaretdb1(
     if only_valid:
         testsets = [tset for tset in testsets if tset["p"] > 0 and tset["n"] > 0]
 
-    return cast(list[Any], testsets if pixel_level else testset)
+    return cast(list[Any], testsets) if pixel_level else [testset]
 
 
 def check_diaretdb1_class(

mlscorecheck/individual/_complex_interval.py

@@ -2,6 +2,7 @@
 This module implements the complex interval arithmetics
 """
 
+from typing import Union
 from ._interval import Interval, IntervalUnion
 
 __all__ = ["ComplexInterval"]
@@ -12,7 +13,7 @@ class ComplexInterval:
     The class represents a complex interval
     """
 
-    def __init__(self, real, imag):
+    def __init__(self, real: Union[float, Interval, IntervalUnion], imag: Union[float, Interval, IntervalUnion]) -> None:
         """
         Constructor of the complex interval
 
@@ -23,7 +24,7 @@ def __init__(self, real, imag):
         self.real = real
         self.imag = imag
 
-    def __add__(self, other):
+    def __add__(self, other: "ComplexInterval") -> "ComplexInterval":
         """
         Addition operator
 
@@ -38,7 +39,7 @@ def __add__(self, other):
 
         return ComplexInterval(self.real + other.real, self.imag + other.imag)
 
-    def __radd__(self, other):
+    def __radd__(self, other: Union[float, Interval, IntervalUnion, "ComplexInterval"]) -> "ComplexInterval":
         """
         Right addition operator
 
@@ -50,7 +51,7 @@ def __radd__(self, other):
         """
         return self + other
 
-    def __sub__(self, other):
+    def __sub__(self, other: Union[float, Interval, IntervalUnion, "ComplexInterval"]) -> "ComplexInterval":
         """
         Subtraction operator
 
@@ -65,7 +66,7 @@ def __sub__(self, other):
 
         return ComplexInterval(self.real - other.real, self.imag - other.imag)
 
-    def __rsub__(self, other):
+    def __rsub__(self, other: Union[float, Interval, IntervalUnion, "ComplexInterval"]) -> "ComplexInterval":
         """
         Right subtraction operator
 
@@ -77,7 +78,7 @@ def __rsub__(self, other):
         """
         return (-1) * self + other
 
-    def __mul__(self, other):
+    def __mul__(self, other: Union[float, Interval, IntervalUnion, "ComplexInterval"]) -> "ComplexInterval":
         """
         Multiplication operator
 
@@ -95,7 +96,7 @@ def __mul__(self, other):
             self.real * other.imag + self.imag * other.real,
         )
 
-    def __rmul__(self, other):
+    def __rmul__(self, other: Union[float, Interval, IntervalUnion, "ComplexInterval"]) -> "ComplexInterval":
         """
         Right multiplication operator
 
@@ -107,7 +108,7 @@ def __rmul__(self, other):
         """
         return self.__mul__(other)
 
-    def __truediv__(self, other):
+    def __truediv__(self, other: Union[float, Interval, IntervalUnion, "ComplexInterval"]) -> "ComplexInterval":
         """
         Division operator
 
@@ -127,7 +128,7 @@ def __truediv__(self, other):
             (self.imag * other.real - self.real * other.imag) / norm,
         )
 
-    def __rtruediv__(self, other):
+    def __rtruediv__(self, other: Union[float, Interval, IntervalUnion, "ComplexInterval"]) -> "ComplexInterval":
         """
         Right division operator
 
@@ -144,7 +145,7 @@ def __rtruediv__(self, other):
 
         return other / self
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         """
         The representation dunder
 
@@ -180,7 +181,7 @@ def __ne__(self, other) -> bool:
         """
         return not self.__eq__(other)
 
-    def __neg__(self):
+    def __neg__(self) -> "ComplexInterval":
         """
         The negation operator
 
@@ -189,7 +190,7 @@ def __neg__(self):
         """
         return ComplexInterval(-self.real, -self.imag)
 
-    def __pow__(self, other):
+    def __pow__(self, other: Union[float, int]) -> "ComplexInterval":
         """
         The power operator
 

mlscorecheck/individual/_interval.py

@@ -1,13 +1,16 @@
 """
-This module implements the interval arithmetics
+Interval arithmetics
 """
 
+from typing import Union
 import numpy as np
 
+from ..core import NUMERICAL_TOLERANCE
+
 __all__ = ["Interval", "IntervalUnion", "sqrt"]
 
 
-def sqrt(obj):
+def sqrt(obj) -> "Interval | IntervalUnion | float":
     """
     Square root of an interval or interval union
 
@@ -28,7 +31,7 @@ class Interval:
     The interval abstraction
     """
 
-    def __init__(self, lower_bound, upper_bound):
+    def __init__(self, lower_bound: float, upper_bound: float) -> None:
         """
         Constructor of the interval
 
@@ -56,7 +59,7 @@ def to_tuple(self) -> tuple:
         """
         return (self.lower_bound, self.upper_bound)
 
-    def contains(self, value) -> bool:
+    def contains(self, value: float) -> bool:
         """
         Check if the interval contains the value
 
@@ -68,7 +71,7 @@ def contains(self, value) -> bool:
         """
         return bool(self.lower_bound <= value <= self.upper_bound)
 
-    def intersection(self, other):
+    def intersection(self, other: "Interval | IntervalUnion") -> "Interval":
         """
         Returns the intersection of two intervals
 
@@ -110,7 +113,7 @@ def integer(self) -> bool:
 
         return bool(np.ceil(self.lower_bound) == np.floor(self.upper_bound))
 
-    def shrink_to_integers(self):
+    def shrink_to_integers(self) -> "Interval":
         """
         Shrinks the interval to integers
 
@@ -140,7 +143,7 @@ def is_empty(self) -> bool:
         """
         return bool(self.upper_bound < self.lower_bound)
 
-    def __add__(self, other):
+    def __add__(self, other: Union[int, float, "Interval"]) -> Union["Interval", "IntervalUnion"]:
         """
         The addition operator
 
@@ -164,7 +167,7 @@ def __add__(self, other):
             upper_bound=self.upper_bound + other.upper_bound,
         )
 
-    def __radd__(self, other):
+    def __radd__(self, other: Union[int, float, "Interval"]) -> Union["Interval", "IntervalUnion"]:
         """
         The right hand addition
 
@@ -176,7 +179,7 @@ def __radd__(self, other):
         """
         return self + other
 
-    def __sub__(self, other):
+    def __sub__(self, other: Union[int, float, "Interval"]) -> Union["Interval", "IntervalUnion"]:
         """
         The subtraction operator
 
@@ -200,7 +203,7 @@ def __sub__(self, other):
             upper_bound=self.upper_bound - other.lower_bound,
         )
 
-    def __rsub__(self, other):
+    def __rsub__(self, other: Union[int, float, "Interval"]) -> Union["Interval", "IntervalUnion"]:
         """
         The right hand subtraction
 
@@ -212,7 +215,7 @@ def __rsub__(self, other):
         """
         return (-1) * self + other
 
-    def __mul__(self, other):
+    def __mul__(self, other: Union[int, float, "Interval"]) -> Union["Interval", "IntervalUnion"]:
         """
         The multiplication operator
 
@@ -238,7 +241,7 @@ def __mul__(self, other):
 
         return Interval(min(term0, term1, term2, term3), max(term0, term1, term2, term3))
 
-    def __rmul__(self, other):
+    def __rmul__(self, other: Union[int, float, "Interval"]) -> Union["Interval", "IntervalUnion"]:
         """
         The right hand multiplication operator
 
@@ -250,7 +253,9 @@ def __rmul__(self, other):
         """
         return self.__mul__(other)
 
-    def __truediv__(self, other):
+    def __truediv__(
+        self, other: Union[int, float, "Interval"]
+    ) -> Union["Interval", "IntervalUnion"]:
         """
         The division operator
 
@@ -287,7 +292,9 @@ def __truediv__(self, other):
 
         return IntervalUnion([self * res_0, self * res_1])
 
-    def __rtruediv__(self, other):
+    def __rtruediv__(
+        self, other: Union[int, float, "Interval"]
+    ) -> Union["Interval", "IntervalUnion"]:
         """
         The right hand division operator
 
@@ -337,7 +344,7 @@ def __ne__(self, other) -> bool:
         """
         return not self.__eq__(other)
 
-    def __neg__(self):
+    def __neg__(self) -> "Interval":
         """
         The negation operator
 
@@ -346,7 +353,7 @@ def __neg__(self):
         """
         return (-1) * self
 
-    def __pow__(self, other):
+    def __pow__(self, other: Union[int, float]) -> "Interval":
         """
         The power operation on the interval
 
@@ -374,7 +381,7 @@ def __pow__(self, other):
 
         return res
 
-    def representing_int(self):
+    def representing_int(self) -> Union[int, None]:
         """
         Returns a representative integer
 
@@ -383,7 +390,7 @@ def representing_int(self):
         """
         shrunk = self.shrink_to_integers()
         if not shrunk.is_empty():
-            return shrunk.lower_bound
+            return int(shrunk.lower_bound)
         return None
 
 
@@ -392,7 +399,7 @@ class IntervalUnion:
     The interval union abstraction
     """
 
-    def __init__(self, intervals):
+    def __init__(self, intervals: Union["Interval", tuple, list]):
         """
         Constructor of the object
 
@@ -425,7 +432,7 @@ def to_tuple(self) -> list:
         """
         return [interval.to_tuple() for interval in self.intervals]
 
-    def simplify(self):
+    def simplify(self) -> None:
         """
         Simplify the union of intervals
 

mlscorecheck/individual/_tptn_solutions.py

@@ -3,6 +3,8 @@
 This is a generated file, do not edit.
 """
 
+# mypy: ignore-errors
+
 # pylint: disable=line-too-long
 # pylint: disable=too-many-lines