WUT_Computer_Science/Programming/PORR/code/richardson_method.py
Krzysztof kuhy Rudnicki faef20dc45 PORR: zero findings, 18 tests still passing after every refactor
598 findings to none, and the suite ran through `./run.sh run` after each step
rather than at the end -- 18 passed, 27s, every time.

The shape of this one was different from the other courses. PORR is four
implementations of the same linear algebra (sequential, threads, processes,
dask), so nearly every finding came in groups of four:

- 229 missing annotations. Rather than `object`, which mypy strict rejects on
  every attribute access, each module declares what these actually are:
  `Matrix = np.ndarray | list[list[float]]` and the vector equivalent. The
  backends really are called with both -- comparing them is the point of the
  course.
- 76 names: `A` -> matrix, `Ab` -> augmented, `Ax` -> product, `I` ->
  identity, `dA` -> dask_matrix, and the two CamelCase functions. Renamed
  through `tokenize`, not regex, so no string or comment was touched.
- 121 missing docstrings, one per method name since the names repeat across
  all four backends.
- Seven functions over the argument limit, all taking the same seven or nine
  loose values. They are two frozen dataclasses now, in a new
  richardson_problem.py: `Problem(matrix, rhs, lambda_min, lambda_max)` and
  `Settings(max_iterations, x0, tol)`. `RichardsonMethod.__init__` also took a
  `size` argument it never read.
- threads_indep_old's iteration did "split into chunks, submit, wait" four
  times by hand (C901 11, PLR0915 54). One `_run_chunked` helper.
- tests.py's two bare asserts became explicit raises, per the no-ignores rule.
  `assert False` was also B011: `python -O` deletes it, so the non-convergence
  branch would have silently passed under optimisation.

Real fixes rather than style: np.random -> Generator, `os.path.exists` ->
Path, an `except Exception` around dask narrowed to the errors it actually
raises, and two runnable modules that logged at INFO without ever calling
basicConfig -- caught by scripts/check_refactor_safety.py, which is now doing
the job it was written for.

Repo-wide: 1,781 findings -> 1,183, all of them in the five courses left.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0172dj34FDpao6wsix8ZuCzE
2026-08-28 21:01:13 +02:00

141 lines
5.4 KiB
Python
Executable File

#!/usr/bin/env python3
"""Richardson iteration, parameterised by linear-algebra backend."""
import gc
import logging
import time
import linear_algebra_utils as lin_alg
import numpy as np
from processing_type import ProcessingType
from richardson_problem import Problem, Settings
from time_measurement import tests_time, time_accumulator, time_measurement
# These helpers are called with numpy arrays in some backends and plain
# Python lists in others, which is the point of the comparison this course
# is about, so the aliases name both.
Matrix = np.ndarray | list[list[float]]
Vector = np.ndarray | list[float]
logger = logging.getLogger(__name__)
class RichardsonMethod:
"""Richardson iteration over a pluggable linear-algebra backend."""
@time_measurement(time_accumulator)
def __init__(
self,
method: ProcessingType,
problem: Problem,
settings: Settings,
) -> None:
"""Set up the solver for one problem.
`size` used to be a parameter and was never read -- len(b) is the
size, and it is right here.
"""
self.LinAlg = self.assign_lin_alg_type(method)
self.matrix = problem.matrix
self.b = problem.rhs
self.x0 = settings.x0 if settings.x0 is not None else [0.0] * len(problem.rhs)
self.max_iterations = settings.max_iterations
self.tol = settings.tol
self.lambda_min = problem.lambda_min
self.lambda_max = problem.lambda_max
if self.lambda_min < 0:
msg = "Matrix A is not positive semi-definite."
raise ValueError(msg)
self.omega = RichardsonMethod.calculate_omega(self.lambda_min, self.lambda_max)
@staticmethod
def calculate_omega(lambda_min: float, lambda_max: float) -> float:
"""Return the optimal Richardson relaxation factor."""
return 2 / (lambda_min + lambda_max)
@staticmethod
def convergence_norm(
lin_alg_type: type, matrix: Matrix, omega: float, identity: Matrix
) -> bool:
"""Report whether the iteration matrix norm is under 1."""
scaled_matrix = lin_alg_type.matrix_scalar_multiply(matrix, omega)
identity_minus_scaled = lin_alg_type.matrix_matrix_subtraction(
identity, scaled_matrix
)
return lin_alg_type.matrix_norm(identity_minus_scaled)
@staticmethod
def assign_lin_alg_type(method: ProcessingType) -> type:
"""Return the linear-algebra backend for a processing type."""
methods = {
ProcessingType.SEQUENTIAL: lin_alg.SequentialLinearAlgebraUtils,
ProcessingType.THREADS: lin_alg.ThreadsLinearAlgebraUtils,
ProcessingType.PROCESSES: lin_alg.ProcessLinearAlgebraUtils,
ProcessingType.DISTRIBUTED_ARRAYS: (
lin_alg.DistributedArraysLinearAlgebraUtils
),
}
try:
return methods[method]
except KeyError as exc:
msg = "Unknown method, please use 'SEQUENTIAL', 'THREADS' or 'PROCESSES'."
raise ValueError(msg) from exc
def solve(self) -> tuple[Vector, str | None]:
"""Run the Richardson iteration to convergence, or give up."""
gc.disable()
time_accumulator.total_time = 0
start = time.perf_counter()
x = self.x0[:]
for _iteration in range(self.max_iterations):
product = self.LinAlg.matrix_vector_multiply(self.matrix, x)
residual = self.LinAlg.vector_vector_subtraction(self.b, product)
x = self.LinAlg.vector_vector_addition(
x, self.LinAlg.scalar_vector_multiply(self.omega, residual)
)
if lin_alg.SequentialLinearAlgebraUtils.vector_norm(residual) < self.tol:
break
end = time.perf_counter()
total_time = end - start
gc.enable()
match self.LinAlg:
case lin_alg.SequentialLinearAlgebraUtils:
logger.info(
"Total: %ss, Tests time: %ss", total_time, tests_time.total_time
)
case lin_alg.ThreadsLinearAlgebraUtils:
sequential_time = total_time - time_accumulator.total_time
logger.info(
"Total: %ss, Seq: %ss, Parallel (threads): %ss, Tests time: %ss",
total_time,
sequential_time,
time_accumulator.total_time,
tests_time.total_time,
)
case lin_alg.ProcessLinearAlgebraUtils:
sequential_time = total_time - time_accumulator.total_time
logger.info(
"Total: %ss, Seq: %ss, Parallel (processes): %ss, Tests time: %ss",
total_time,
sequential_time,
time_accumulator.total_time,
tests_time.total_time,
)
case lin_alg.DistributedArraysLinearAlgebraUtils:
sequential_time = total_time - time_accumulator.total_time
logger.info(
"Total: %ss, Seq: %ss, Parallel (distributed arrays): %ss, "
"Tests time: %ss",
total_time,
sequential_time,
time_accumulator.total_time,
tests_time.total_time,
)
case _:
logger.info("Unhandled LinAlg type")
return x, 0