Several fixes

Author: basnijholt

adaptive/_types.py

@@ -1,5 +1,6 @@
 # Only used for static type checkers, should only be imported in `if TYPE_CHECKING` block
 # Workaround described in https://github.com/agronholm/typeguard/issues/456
+
 import concurrent.futures as concurrent
 from typing import TypeAlias
 

adaptive/learner/learner1D.py

@@ -106,18 +106,18 @@ def abs_min_log_loss(xs: XsType0, ys: YsType0) -> Float:
 @uses_nth_neighbors(1)
 def triangle_loss(xs: XsType1, ys: YsType1) -> Float:
     assert len(xs) == 4
-    xs = [x for x in xs if x is not None]  # type: ignore[assignment]
-    ys = [y for y in ys if y is not None]  # type: ignore[assignment]
+    x = [x for x in xs if x is not None]
+    y = [y for y in ys if y is not None]
 
-    if len(xs) == 2:  # we do not have enough points for a triangle
-        return xs[1] - xs[0]  # type: ignore[operator]
+    if len(x) == 2:  # we do not have enough points for a triangle
+        return x[1] - x[0]  # type: ignore[operator]
 
-    N = len(xs) - 2  # number of constructed triangles
-    if isinstance(ys[0], collections.abc.Iterable):
-        pts = [(x, *y) for x, y in zip(xs, ys)]  # type: ignore[misc]
+    N = len(x) - 2  # number of constructed triangles
+    if isinstance(y[0], collections.abc.Iterable):
+        pts = [(x, *y) for x, y in zip(x, y)]  # type: ignore[misc]
         vol = simplex_volume_in_embedding
     else:
-        pts = list(zip(xs, ys))
+        pts = list(zip(x, y))
         vol = volume
     return sum(vol(pts[i : i + 3]) for i in range(N)) / N
 

adaptive/learner/sequence_learner.py

@@ -134,7 +134,7 @@ def remove_unfinished(self) -> None:
         self.pending_points = set()
 
     def tell(self, point: PointType, value: Any) -> None:
-        index, point = point
+        index, _ = point
         self.data[index] = value
         self.pending_points.discard(index)
         self._to_do_indices.discard(index)