Merge branch 'TheAlgorithms:master' into master

Author: tianyizheng02

Diff for: DIRECTORY.md

@@ -294,7 +294,6 @@
   * [Mergesort](divide_and_conquer/mergesort.py)
   * [Peak](divide_and_conquer/peak.py)
   * [Power](divide_and_conquer/power.py)
-  * [Strassen Matrix Multiplication](divide_and_conquer/strassen_matrix_multiplication.py)
 
 ## Dynamic Programming
   * [Abbreviation](dynamic_programming/abbreviation.py)

Diff for: conversions/prefix_conversions_string.py

@@ -96,7 +96,7 @@ def add_si_prefix(value: float) -> str:
     for name_prefix, value_prefix in prefixes.items():
         numerical_part = value / (10**value_prefix)
         if numerical_part > 1:
-            return f"{str(numerical_part)} {name_prefix}"
+            return f"{numerical_part!s} {name_prefix}"
     return str(value)
 
 
@@ -111,7 +111,7 @@ def add_binary_prefix(value: float) -> str:
     for prefix in BinaryUnit:
         numerical_part = value / (2**prefix.value)
         if numerical_part > 1:
-            return f"{str(numerical_part)} {prefix.name}"
+            return f"{numerical_part!s} {prefix.name}"
     return str(value)
 
 

Diff for: conversions/rgb_hsv_conversion.py

@@ -121,8 +121,8 @@ def rgb_to_hsv(red: int, green: int, blue: int) -> list[float]:
     float_red = red / 255
     float_green = green / 255
     float_blue = blue / 255
-    value = max(max(float_red, float_green), float_blue)
-    chroma = value - min(min(float_red, float_green), float_blue)
+    value = max(float_red, float_green, float_blue)
+    chroma = value - min(float_red, float_green, float_blue)
     saturation = 0 if value == 0 else chroma / value
 
     if chroma == 0:

Diff for: digital_image_processing/test_digital_image_processing.py

@@ -96,7 +96,7 @@ def test_nearest_neighbour(
 
 
 def test_local_binary_pattern():
-    file_path: str = "digital_image_processing/image_data/lena.jpg"
+    file_path = "digital_image_processing/image_data/lena.jpg"
 
     # Reading the image and converting it to grayscale.
     image = imread(file_path, 0)

Diff for: divide_and_conquer/strassen_matrix_multiplication.py renamed to divide_and_conquer/strassen_matrix_multiplication.py.BROKEN

@@ -122,7 +122,7 @@ def strassen(matrix1: list, matrix2: list) -> list:
     if dimension1[0] == dimension1[1] and dimension2[0] == dimension2[1]:
         return [matrix1, matrix2]
 
-    maximum = max(max(dimension1), max(dimension2))
+    maximum = max(dimension1, dimension2)
     maxim = int(math.pow(2, math.ceil(math.log2(maximum))))
     new_matrix1 = matrix1
     new_matrix2 = matrix2

Diff for: dynamic_programming/fibonacci.py

@@ -24,7 +24,7 @@ def get(self, index: int) -> list:
         return self.sequence[:index]
 
 
-def main():
+def main() -> None:
     print(
         "Fibonacci Series Using Dynamic Programming\n",
         "Enter the index of the Fibonacci number you want to calculate ",

Diff for: maths/euclidean_distance.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
+import typing
 from collections.abc import Iterable
-from typing import Union
 
 import numpy as np
 
-Vector = Union[Iterable[float], Iterable[int], np.ndarray]
-VectorOut = Union[np.float64, int, float]
+Vector = typing.Union[Iterable[float], Iterable[int], np.ndarray]  # noqa: UP007
+VectorOut = typing.Union[np.float64, int, float]  # noqa: UP007
 
 
 def euclidean_distance(vector_1: Vector, vector_2: Vector) -> VectorOut:

Diff for: physics/horizontal_projectile_motion.py

@@ -147,6 +147,6 @@ def test_motion() -> None:
     # Print results
     print()
     print("Results: ")
-    print(f"Horizontal Distance: {str(horizontal_distance(init_vel, angle))} [m]")
-    print(f"Maximum Height: {str(max_height(init_vel, angle))} [m]")
-    print(f"Total Time: {str(total_time(init_vel, angle))} [s]")
+    print(f"Horizontal Distance: {horizontal_distance(init_vel, angle)!s} [m]")
+    print(f"Maximum Height: {max_height(init_vel, angle)!s} [m]")
+    print(f"Total Time: {total_time(init_vel, angle)!s} [s]")

Diff for: searches/binary_tree_traversal.py

@@ -13,11 +13,9 @@ def __init__(self, data):
         self.left = None
 
 
-def build_tree():
+def build_tree() -> TreeNode:
     print("\n********Press N to stop entering at any point of time********\n")
-    check = input("Enter the value of the root node: ").strip().lower() or "n"
-    if check == "n":
-        return None
+    check = input("Enter the value of the root node: ").strip().lower()
     q: queue.Queue = queue.Queue()
     tree_node = TreeNode(int(check))
     q.put(tree_node)
@@ -37,7 +35,7 @@ def build_tree():
         right_node = TreeNode(int(check))
         node_found.right = right_node
         q.put(right_node)
-    return None
+    raise
 
 
 def pre_order(node: TreeNode) -> None:
@@ -272,7 +270,7 @@ def prompt(s: str = "", width=50, char="*") -> str:
     doctest.testmod()
     print(prompt("Binary Tree Traversals"))
 
-    node = build_tree()
+    node: TreeNode = build_tree()
     print(prompt("Pre Order Traversal"))
     pre_order(node)
     print(prompt() + "\n")