Various ruff fixes (#12821)

Author: cclauss

DIRECTORY.md

@@ -443,6 +443,7 @@
  * [Present Value](financial/present_value.py)
  * [Price Plus Tax](financial/price_plus_tax.py)
  * [Simple Moving Average](financial/simple_moving_average.py)
+ * [Straight Line Depreciation](financial/straight_line_depreciation.py)
  * [Time And Half Pay](financial/time_and_half_pay.py)
 
 ## Fractals
@@ -790,6 +791,7 @@
  * [Sumset](maths/sumset.py)
  * [Sylvester Sequence](maths/sylvester_sequence.py)
  * [Tanh](maths/tanh.py)
+ * [Test Factorial](maths/test_factorial.py)
  * [Test Prime Check](maths/test_prime_check.py)
  * [Three Sum](maths/three_sum.py)
  * [Trapezoidal Rule](maths/trapezoidal_rule.py)

ciphers/hill_cipher.py

@@ -79,7 +79,7 @@ def replace_digits(self, num: int) -> str:
  >>> hill_cipher.replace_digits(26)
  '0'
  """
- return self.key_string[round(num)]
+ return self.key_string[(num)]
 
  def check_determinant(self) -> None:
  """

data_structures/binary_tree/non_recursive_segment_tree.py

@@ -39,12 +39,12 @@
 from __future__ import annotations
 
 from collections.abc import Callable
-from typing import Any, Generic, TypeVar
+from typing import Any, TypeVar
 
 T = TypeVar("T")
 
 
-class SegmentTree(Generic[T]):
+class SegmentTree[T]:
  def __init__(self, arr: list[T], fnc: Callable[[T, T], T]) -> None:
  """
  Segment Tree constructor, it works just with commutative combiner.

data_structures/hashing/hash_map.py

@@ -10,14 +10,14 @@
 
 from collections.abc import Iterator, MutableMapping
 from dataclasses import dataclass
-from typing import Generic, TypeVar
+from typing import TypeVar
 
 KEY = TypeVar("KEY")
 VAL = TypeVar("VAL")
 
 
 @dataclass(slots=True)
-class _Item(Generic[KEY, VAL]):
+class _Item[KEY, VAL]:
  key: KEY
  val: VAL
 

data_structures/heap/heap.py

@@ -2,7 +2,7 @@
 
 from abc import abstractmethod
 from collections.abc import Iterable
-from typing import Generic, Protocol, TypeVar
+from typing import Protocol, TypeVar
 
 
 class Comparable(Protocol):
@@ -22,7 +22,7 @@ def __eq__(self: T, other: object) -> bool:
 T = TypeVar("T", bound=Comparable)
 
 
-class Heap(Generic[T]):
+class Heap[T: Comparable]:
  """A Max Heap Implementation
 
  >>> unsorted = [103, 9, 1, 7, 11, 15, 25, 201, 209, 107, 5]

data_structures/heap/randomized_heap.py

@@ -4,12 +4,12 @@
 
 import random
 from collections.abc import Iterable
-from typing import Any, Generic, TypeVar
+from typing import Any, TypeVar
 
 T = TypeVar("T", bound=bool)
 
 
-class RandomizedHeapNode(Generic[T]):
+class RandomizedHeapNode[T: bool]:
  """
  One node of the randomized heap. Contains the value and references to
  two children.
@@ -73,7 +73,7 @@ def merge(
  return root1
 
 
-class RandomizedHeap(Generic[T]):
+class RandomizedHeap[T: bool]:
  """
  A data structure that allows inserting a new value and to pop the smallest
  values. Both operations take O(logN) time where N is the size of the

data_structures/heap/skew_heap.py

@@ -3,12 +3,12 @@
 from __future__ import annotations
 
 from collections.abc import Iterable, Iterator
-from typing import Any, Generic, TypeVar
+from typing import Any, TypeVar
 
 T = TypeVar("T", bound=bool)
 
 
-class SkewNode(Generic[T]):
+class SkewNode[T: bool]:
  """
  One node of the skew heap. Contains the value and references to
  two children.
@@ -87,7 +87,7 @@ def merge(
  return result
 
 
-class SkewHeap(Generic[T]):
+class SkewHeap[T: bool]:
  """
  A data structure that allows inserting a new value and to pop the smallest
  values. Both operations take O(logN) time where N is the size of the

data_structures/linked_list/skip_list.py

@@ -7,13 +7,13 @@
 
 from itertools import pairwise
 from random import random
-from typing import Generic, TypeVar
+from typing import TypeVar
 
 KT = TypeVar("KT")
 VT = TypeVar("VT")
 
 
-class Node(Generic[KT, VT]):
+class Node[KT, VT]:
  def __init__(self, key: KT | str = "root", value: VT | None = None):
  self.key = key
  self.value = value
@@ -49,7 +49,7 @@ def level(self) -> int:
  return len(self.forward)
 
 
-class SkipList(Generic[KT, VT]):
+class SkipList[KT, VT]:
  def __init__(self, p: float = 0.5, max_level: int = 16):
  self.head: Node[KT, VT] = Node[KT, VT]()
  self.level = 0

data_structures/queues/queue_by_list.py

@@ -1,13 +1,10 @@
 """Queue represented by a Python list"""
 
 from collections.abc import Iterable
-from typing import Generic, TypeVar
 
-_T = TypeVar("_T")
 
-
-class QueueByList(Generic[_T]):
- def __init__(self, iterable: Iterable[_T] | None = None) -> None:
+class QueueByList[T]:
+ def __init__(self, iterable: Iterable[T] | None = None) -> None:
  """
  >>> QueueByList()
  Queue(())
@@ -16,7 +13,7 @@ def __init__(self, iterable: Iterable[_T] | None = None) -> None:
  >>> QueueByList((i**2 for i in range(1, 4)))
  Queue((1, 4, 9))
  """
- self.entries: list[_T] = list(iterable or [])
+ self.entries: list[T] = list(iterable or [])
 
  def __len__(self) -> int:
  """
@@ -58,7 +55,7 @@ def __repr__(self) -> str:
 
  return f"Queue({tuple(self.entries)})"
 
- def put(self, item: _T) -> None:
+ def put(self, item: T) -> None:
  """Put `item` to the Queue
 
  >>> queue = QueueByList()
@@ -72,7 +69,7 @@ def put(self, item: _T) -> None:
 
  self.entries.append(item)
 
- def get(self) -> _T:
+ def get(self) -> T:
  """
  Get `item` from the Queue
 
@@ -118,7 +115,7 @@ def rotate(self, rotation: int) -> None:
  for _ in range(rotation):
  put(get(0))
 
- def get_front(self) -> _T:
+ def get_front(self) -> T:
  """Get the front item from the Queue
 
  >>> queue = QueueByList((10, 20, 30))

data_structures/queues/queue_by_two_stacks.py

@@ -1,13 +1,10 @@
 """Queue implementation using two stacks"""
 
 from collections.abc import Iterable
-from typing import Generic, TypeVar
 
-_T = TypeVar("_T")
 
-
-class QueueByTwoStacks(Generic[_T]):
- def __init__(self, iterable: Iterable[_T] | None = None) -> None:
+class QueueByTwoStacks[T]:
+ def __init__(self, iterable: Iterable[T] | None = None) -> None:
  """
  >>> QueueByTwoStacks()
  Queue(())
@@ -16,8 +13,8 @@ def __init__(self, iterable: Iterable[_T] | None = None) -> None:
  >>> QueueByTwoStacks((i**2 for i in range(1, 4)))
  Queue((1, 4, 9))
  """
- self._stack1: list[_T] = list(iterable or [])
- self._stack2: list[_T] = []
+ self._stack1: list[T] = list(iterable or [])
+ self._stack2: list[T] = []
 
  def __len__(self) -> int:
  """
@@ -59,7 +56,7 @@ def __repr__(self) -> str:
  """
  return f"Queue({tuple(self._stack2[::-1] + self._stack1)})"
 
- def put(self, item: _T) -> None:
+ def put(self, item: T) -> None:
  """
  Put `item` into the Queue
 
@@ -74,7 +71,7 @@ def put(self, item: _T) -> None:
 
  self._stack1.append(item)
 
- def get(self) -> _T:
+ def get(self) -> T:
  """
  Get `item` from the Queue