Skip to content

Commit 331a68c

Browse files
committed
Merge branch 'master' into fix-some-RUF012-per-file-ignores
2 parents d97fe7a + 4fe50bc commit 331a68c

File tree

102 files changed

+1958
-933
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+1958
-933
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v4
13-
- uses: astral-sh/setup-uv@v4
13+
- uses: astral-sh/setup-uv@v5
1414
with:
1515
enable-cache: true
1616
cache-dependency-glob: uv.lock

.github/workflows/project_euler.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- uses: actions/checkout@v4
18-
- uses: astral-sh/setup-uv@v4
18+
- uses: astral-sh/setup-uv@v5
1919
- uses: actions/setup-python@v5
2020
with:
2121
python-version: 3.x
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- uses: actions/checkout@v4
28-
- uses: astral-sh/setup-uv@v4
28+
- uses: astral-sh/setup-uv@v5
2929
- uses: actions/setup-python@v5
3030
with:
3131
python-version: 3.x

.github/workflows/ruff.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v4
15-
- uses: astral-sh/setup-uv@v4
15+
- uses: astral-sh/setup-uv@v5
1616
- run: uvx ruff check --output-format=github .

.github/workflows/sphinx.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- uses: actions/checkout@v4
29-
- uses: astral-sh/setup-uv@v4
29+
- uses: astral-sh/setup-uv@v5
3030
- uses: actions/setup-python@v5
3131
with:
3232
python-version: 3.13

.pre-commit-config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ repos:
1616
- id: auto-walrus
1717

1818
- repo: https://github.com/astral-sh/ruff-pre-commit
19-
rev: v0.8.3
19+
rev: v0.9.1
2020
hooks:
2121
- id: ruff
2222
- id: ruff-format
@@ -47,7 +47,7 @@ repos:
4747
- id: validate-pyproject
4848

4949
- repo: https://github.com/pre-commit/mirrors-mypy
50-
rev: v1.13.0
50+
rev: v1.14.1
5151
hooks:
5252
- id: mypy
5353
args:

DIRECTORY.md

+8-2
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
* [Baconian Cipher](ciphers/baconian_cipher.py)
8787
* [Base16](ciphers/base16.py)
8888
* [Base32](ciphers/base32.py)
89-
* [Base64](ciphers/base64.py)
89+
* [Base64 Cipher](ciphers/base64_cipher.py)
9090
* [Base85](ciphers/base85.py)
9191
* [Beaufort Cipher](ciphers/beaufort_cipher.py)
9292
* [Bifid](ciphers/bifid.py)
@@ -142,6 +142,7 @@
142142
* [Haralick Descriptors](computer_vision/haralick_descriptors.py)
143143
* [Harris Corner](computer_vision/harris_corner.py)
144144
* [Horn Schunck](computer_vision/horn_schunck.py)
145+
* [Intensity Based Segmentation](computer_vision/intensity_based_segmentation.py)
145146
* [Mean Threshold](computer_vision/mean_threshold.py)
146147
* [Mosaic Augmentation](computer_vision/mosaic_augmentation.py)
147148
* [Pooling Functions](computer_vision/pooling_functions.py)
@@ -169,6 +170,7 @@
169170
* [Prefix Conversions](conversions/prefix_conversions.py)
170171
* [Prefix Conversions String](conversions/prefix_conversions_string.py)
171172
* [Pressure Conversions](conversions/pressure_conversions.py)
173+
* [Rectangular To Polar](conversions/rectangular_to_polar.py)
172174
* [Rgb Cmyk Conversion](conversions/rgb_cmyk_conversion.py)
173175
* [Rgb Hsv Conversion](conversions/rgb_hsv_conversion.py)
174176
* [Roman Numerals](conversions/roman_numerals.py)
@@ -460,6 +462,7 @@
460462

461463
## Graphics
462464
* [Bezier Curve](graphics/bezier_curve.py)
465+
* [Digital Differential Analyzer Line](graphics/digital_differential_analyzer_line.py)
463466
* [Vector3 For 2D Rendering](graphics/vector3_for_2d_rendering.py)
464467

465468
## Graphs
@@ -506,6 +509,7 @@
506509
* [Kahns Algorithm Long](graphs/kahns_algorithm_long.py)
507510
* [Kahns Algorithm Topo](graphs/kahns_algorithm_topo.py)
508511
* [Karger](graphs/karger.py)
512+
* [Lanczos Eigenvectors](graphs/lanczos_eigenvectors.py)
509513
* [Markov Chain](graphs/markov_chain.py)
510514
* [Matching Min Vertex Cover](graphs/matching_min_vertex_cover.py)
511515
* [Minimum Path Sum](graphs/minimum_path_sum.py)
@@ -660,6 +664,7 @@
660664
* [Gamma](maths/gamma.py)
661665
* [Gaussian](maths/gaussian.py)
662666
* [Gcd Of N Numbers](maths/gcd_of_n_numbers.py)
667+
* [Geometric Mean](maths/geometric_mean.py)
663668
* [Germain Primes](maths/germain_primes.py)
664669
* [Greatest Common Divisor](maths/greatest_common_divisor.py)
665670
* [Hardy Ramanujanalgo](maths/hardy_ramanujanalgo.py)
@@ -885,6 +890,7 @@
885890
* [N Body Simulation](physics/n_body_simulation.py)
886891
* [Newtons Law Of Gravitation](physics/newtons_law_of_gravitation.py)
887892
* [Newtons Second Law Of Motion](physics/newtons_second_law_of_motion.py)
893+
* [Period Of Pendulum](physics/period_of_pendulum.py)
888894
* [Photoelectric Effect](physics/photoelectric_effect.py)
889895
* [Potential Energy](physics/potential_energy.py)
890896
* [Rainfall Intensity](physics/rainfall_intensity.py)
@@ -1325,7 +1331,7 @@
13251331
* [Title](strings/title.py)
13261332
* [Top K Frequent Words](strings/top_k_frequent_words.py)
13271333
* [Upper](strings/upper.py)
1328-
* [Wave](strings/wave.py)
1334+
* [Wave String](strings/wave_string.py)
13291335
* [Wildcard Pattern Matching](strings/wildcard_pattern_matching.py)
13301336
* [Word Occurrence](strings/word_occurrence.py)
13311337
* [Word Patterns](strings/word_patterns.py)

audio_filters/iir_filter.py

+19-13
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,17 @@ class IIRFilter:
1010
1111
Implementation details:
1212
Based on the 2nd-order function from
13-
https://en.wikipedia.org/wiki/Digital_biquad_filter,
13+
https://en.wikipedia.org/wiki/Digital_biquad_filter,
1414
this generalized N-order function was made.
1515
1616
Using the following transfer function
17-
H(z)=\frac{b_{0}+b_{1}z^{-1}+b_{2}z^{-2}+...+b_{k}z^{-k}}{a_{0}+a_{1}z^{-1}+a_{2}z^{-2}+...+a_{k}z^{-k}}
17+
.. math:: H(z)=\frac{b_{0}+b_{1}z^{-1}+b_{2}z^{-2}+...+b_{k}z^{-k}}
18+
{a_{0}+a_{1}z^{-1}+a_{2}z^{-2}+...+a_{k}z^{-k}}
19+
1820
we can rewrite this to
19-
y[n]={\frac{1}{a_{0}}}\left(\left(b_{0}x[n]+b_{1}x[n-1]+b_{2}x[n-2]+...+b_{k}x[n-k]\right)-\left(a_{1}y[n-1]+a_{2}y[n-2]+...+a_{k}y[n-k]\right)\right)
21+
.. math:: y[n]={\frac{1}{a_{0}}}
22+
\left(\left(b_{0}x[n]+b_{1}x[n-1]+b_{2}x[n-2]+...+b_{k}x[n-k]\right)-
23+
\left(a_{1}y[n-1]+a_{2}y[n-2]+...+a_{k}y[n-k]\right)\right)
2024
"""
2125

2226
def __init__(self, order: int) -> None:
@@ -34,17 +38,19 @@ def __init__(self, order: int) -> None:
3438

3539
def set_coefficients(self, a_coeffs: list[float], b_coeffs: list[float]) -> None:
3640
"""
37-
Set the coefficients for the IIR filter. These should both be of size order + 1.
38-
a_0 may be left out, and it will use 1.0 as default value.
41+
Set the coefficients for the IIR filter.
42+
These should both be of size `order` + 1.
43+
:math:`a_0` may be left out, and it will use 1.0 as default value.
3944
4045
This method works well with scipy's filter design functions
41-
>>> # Make a 2nd-order 1000Hz butterworth lowpass filter
42-
>>> import scipy.signal
43-
>>> b_coeffs, a_coeffs = scipy.signal.butter(2, 1000,
44-
... btype='lowpass',
45-
... fs=48000)
46-
>>> filt = IIRFilter(2)
47-
>>> filt.set_coefficients(a_coeffs, b_coeffs)
46+
47+
>>> # Make a 2nd-order 1000Hz butterworth lowpass filter
48+
>>> import scipy.signal
49+
>>> b_coeffs, a_coeffs = scipy.signal.butter(2, 1000,
50+
... btype='lowpass',
51+
... fs=48000)
52+
>>> filt = IIRFilter(2)
53+
>>> filt.set_coefficients(a_coeffs, b_coeffs)
4854
"""
4955
if len(a_coeffs) < self.order:
5056
a_coeffs = [1.0, *a_coeffs]
@@ -68,7 +74,7 @@ def set_coefficients(self, a_coeffs: list[float], b_coeffs: list[float]) -> None
6874

6975
def process(self, sample: float) -> float:
7076
"""
71-
Calculate y[n]
77+
Calculate :math:`y[n]`
7278
7379
>>> filt = IIRFilter(2)
7480
>>> filt.process(0)

backtracking/all_combinations.py

+34
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
def combination_lists(n: int, k: int) -> list[list[int]]:
1414
"""
15+
Generates all possible combinations of k numbers out of 1 ... n using itertools.
16+
1517
>>> combination_lists(n=4, k=2)
1618
[[1, 2], [1, 3], [1, 4], [2, 3], [2, 4], [3, 4]]
1719
"""
@@ -20,6 +22,8 @@ def combination_lists(n: int, k: int) -> list[list[int]]:
2022

2123
def generate_all_combinations(n: int, k: int) -> list[list[int]]:
2224
"""
25+
Generates all possible combinations of k numbers out of 1 ... n using backtracking.
26+
2327
>>> generate_all_combinations(n=4, k=2)
2428
[[1, 2], [1, 3], [1, 4], [2, 3], [2, 4], [3, 4]]
2529
>>> generate_all_combinations(n=0, k=0)
@@ -34,6 +38,14 @@ def generate_all_combinations(n: int, k: int) -> list[list[int]]:
3438
ValueError: n must not be negative
3539
>>> generate_all_combinations(n=5, k=4)
3640
[[1, 2, 3, 4], [1, 2, 3, 5], [1, 2, 4, 5], [1, 3, 4, 5], [2, 3, 4, 5]]
41+
>>> generate_all_combinations(n=3, k=3)
42+
[[1, 2, 3]]
43+
>>> generate_all_combinations(n=3, k=1)
44+
[[1], [2], [3]]
45+
>>> generate_all_combinations(n=1, k=0)
46+
[[]]
47+
>>> generate_all_combinations(n=1, k=1)
48+
[[1]]
3749
>>> from itertools import combinations
3850
>>> all(generate_all_combinations(n, k) == combination_lists(n, k)
3951
... for n in range(1, 6) for k in range(1, 6))
@@ -56,6 +68,28 @@ def create_all_state(
5668
current_list: list[int],
5769
total_list: list[list[int]],
5870
) -> None:
71+
"""
72+
Helper function to recursively build all combinations.
73+
74+
>>> create_all_state(1, 4, 2, [], result := [])
75+
>>> result
76+
[[1, 2], [1, 3], [1, 4], [2, 3], [2, 4], [3, 4]]
77+
>>> create_all_state(1, 3, 3, [], result := [])
78+
>>> result
79+
[[1, 2, 3]]
80+
>>> create_all_state(2, 2, 1, [1], result := [])
81+
>>> result
82+
[[1, 2]]
83+
>>> create_all_state(1, 0, 0, [], result := [])
84+
>>> result
85+
[[]]
86+
>>> create_all_state(1, 4, 0, [1, 2], result := [])
87+
>>> result
88+
[[1, 2]]
89+
>>> create_all_state(5, 4, 2, [1, 2], result := [])
90+
>>> result
91+
[]
92+
"""
5993
if level == 0:
6094
total_list.append(current_list[:])
6195
return

cellular_automata/wa_tor.py

+26-28
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
"""
22
Wa-Tor algorithm (1984)
33
4-
@ https://en.wikipedia.org/wiki/Wa-Tor
5-
@ https://beltoforion.de/en/wator/
6-
@ https://beltoforion.de/en/wator/images/wator_medium.webm
4+
| @ https://en.wikipedia.org/wiki/Wa-Tor
5+
| @ https://beltoforion.de/en/wator/
6+
| @ https://beltoforion.de/en/wator/images/wator_medium.webm
77
88
This solution aims to completely remove any systematic approach
99
to the Wa-Tor planet, and utilise fully random methods.
@@ -97,8 +97,8 @@ class WaTor:
9797
9898
:attr time_passed: A function that is called every time
9999
time passes (a chronon) in order to visually display
100-
the new Wa-Tor planet. The time_passed function can block
101-
using time.sleep to slow the algorithm progression.
100+
the new Wa-Tor planet. The `time_passed` function can block
101+
using ``time.sleep`` to slow the algorithm progression.
102102
103103
>>> wt = WaTor(10, 15)
104104
>>> wt.width
@@ -216,7 +216,7 @@ def get_surrounding_prey(self, entity: Entity) -> list[Entity]:
216216
"""
217217
Returns all the prey entities around (N, S, E, W) a predator entity.
218218
219-
Subtly different to the try_to_move_to_unoccupied square.
219+
Subtly different to the `move_and_reproduce`.
220220
221221
>>> wt = WaTor(WIDTH, HEIGHT)
222222
>>> wt.set_planet([
@@ -260,7 +260,7 @@ def move_and_reproduce(
260260
"""
261261
Attempts to move to an unoccupied neighbouring square
262262
in either of the four directions (North, South, East, West).
263-
If the move was successful and the remaining_reproduction time is
263+
If the move was successful and the `remaining_reproduction_time` is
264264
equal to 0, then a new prey or predator can also be created
265265
in the previous square.
266266
@@ -351,12 +351,12 @@ def perform_prey_actions(
351351
Performs the actions for a prey entity
352352
353353
For prey the rules are:
354-
1. At each chronon, a prey moves randomly to one of the adjacent unoccupied
355-
squares. If there are no free squares, no movement takes place.
356-
2. Once a prey has survived a certain number of chronons it may reproduce.
357-
This is done as it moves to a neighbouring square,
358-
leaving behind a new prey in its old position.
359-
Its reproduction time is also reset to zero.
354+
1. At each chronon, a prey moves randomly to one of the adjacent unoccupied
355+
squares. If there are no free squares, no movement takes place.
356+
2. Once a prey has survived a certain number of chronons it may reproduce.
357+
This is done as it moves to a neighbouring square,
358+
leaving behind a new prey in its old position.
359+
Its reproduction time is also reset to zero.
360360
361361
>>> wt = WaTor(WIDTH, HEIGHT)
362362
>>> reproducable_entity = Entity(True, coords=(0, 1))
@@ -382,15 +382,15 @@ def perform_predator_actions(
382382
:param occupied_by_prey_coords: Move to this location if there is prey there
383383
384384
For predators the rules are:
385-
1. At each chronon, a predator moves randomly to an adjacent square occupied
386-
by a prey. If there is none, the predator moves to a random adjacent
387-
unoccupied square. If there are no free squares, no movement takes place.
388-
2. At each chronon, each predator is deprived of a unit of energy.
389-
3. Upon reaching zero energy, a predator dies.
390-
4. If a predator moves to a square occupied by a prey,
391-
it eats the prey and earns a certain amount of energy.
392-
5. Once a predator has survived a certain number of chronons
393-
it may reproduce in exactly the same way as the prey.
385+
1. At each chronon, a predator moves randomly to an adjacent square occupied
386+
by a prey. If there is none, the predator moves to a random adjacent
387+
unoccupied square. If there are no free squares, no movement takes place.
388+
2. At each chronon, each predator is deprived of a unit of energy.
389+
3. Upon reaching zero energy, a predator dies.
390+
4. If a predator moves to a square occupied by a prey,
391+
it eats the prey and earns a certain amount of energy.
392+
5. Once a predator has survived a certain number of chronons
393+
it may reproduce in exactly the same way as the prey.
394394
395395
>>> wt = WaTor(WIDTH, HEIGHT)
396396
>>> wt.set_planet([[Entity(True, coords=(0, 0)), Entity(False, coords=(0, 1))]])
@@ -430,7 +430,7 @@ def perform_predator_actions(
430430

431431
def run(self, *, iteration_count: int) -> None:
432432
"""
433-
Emulate time passing by looping iteration_count times
433+
Emulate time passing by looping `iteration_count` times
434434
435435
>>> wt = WaTor(WIDTH, HEIGHT)
436436
>>> wt.run(iteration_count=PREDATOR_INITIAL_ENERGY_VALUE - 1)
@@ -484,11 +484,9 @@ def visualise(wt: WaTor, iter_number: int, *, colour: bool = True) -> None:
484484
an ascii code in terminal to clear and re-print
485485
the Wa-Tor planet at intervals.
486486
487-
Uses ascii colour codes to colourfully display
488-
the predators and prey.
489-
490-
(0x60f197) Prey = #
491-
(0xfffff) Predator = x
487+
Uses ascii colour codes to colourfully display the predators and prey:
488+
* (0x60f197) Prey = ``#``
489+
* (0xfffff) Predator = ``x``
492490
493491
>>> wt = WaTor(30, 30)
494492
>>> wt.set_planet([

ciphers/autokey.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"""
22
https://en.wikipedia.org/wiki/Autokey_cipher
3+
34
An autokey cipher (also known as the autoclave cipher) is a cipher that
45
incorporates the message (the plaintext) into the key.
56
The key is generated from the message in some automated fashion,
@@ -10,8 +11,9 @@
1011

1112
def encrypt(plaintext: str, key: str) -> str:
1213
"""
13-
Encrypt a given plaintext (string) and key (string), returning the
14+
Encrypt a given `plaintext` (string) and `key` (string), returning the
1415
encrypted ciphertext.
16+
1517
>>> encrypt("hello world", "coffee")
1618
'jsqqs avvwo'
1719
>>> encrypt("coffee is good as python", "TheAlgorithms")
@@ -74,8 +76,9 @@ def encrypt(plaintext: str, key: str) -> str:
7476

7577
def decrypt(ciphertext: str, key: str) -> str:
7678
"""
77-
Decrypt a given ciphertext (string) and key (string), returning the decrypted
79+
Decrypt a given `ciphertext` (string) and `key` (string), returning the decrypted
7880
ciphertext.
81+
7982
>>> decrypt("jsqqs avvwo", "coffee")
8083
'hello world'
8184
>>> decrypt("vvjfpk wj ohvp su ddylsv", "TheAlgorithms")

0 commit comments

Comments
 (0)