change the type of Matrix entries to float

Author: wojtask

src/book/data_structures.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import math
 from builtins import len
 from collections.abc import Callable
 from typing import Any
@@ -70,10 +71,10 @@ class Matrix:
     __end_row: int
     __start_col: int
     __end_col: int
-    __elements: list[list[int]]
+    __elements: list[list[float]]
 
     def __init__(self, end_row: int, end_col: int, start_row: int = 1, start_col: int = 1,
-                 elements: list[list[int]] | None = None) -> None:
+                 elements: list[list[float]] | None = None) -> None:
         if elements is None:
             assert start_row == 1
             assert start_col == 1
@@ -97,13 +98,13 @@ def even_rows_submatrix(self) -> Matrix:
         return Matrix(start_row=self.__start_row, end_row=submatrix_end_row, start_col=self.__start_col,
                       end_col=self.__end_col, elements=even_rows)
 
-    def __getitem__(self, indices: tuple[int, int]) -> int:
+    def __getitem__(self, indices: tuple[int, int]) -> float:
         row, col = indices[0], indices[1]
         assert 1 <= row <= self.__end_row - self.__start_row + 1
         assert 1 <= col <= self.__end_col - self.__start_col + 1
         return self.__elements[self.__start_row - 1 + row - 1][self.__start_col - 1 + col - 1]
 
-    def __setitem__(self, indices: tuple[int, int], value: int) -> None:
+    def __setitem__(self, indices: tuple[int, int], value: float) -> None:
         row, col = indices[0], indices[1]
         assert 1 <= row <= self.__end_row - self.__start_row + 1
         assert 1 <= col <= self.__end_col - self.__start_col + 1
@@ -114,7 +115,7 @@ def __eq__(self, other: Any) -> bool:
             return NotImplemented
         for i, row in enumerate(self.__elements, start=1):
             for j, element in enumerate(row, start=1):
-                if element != other[i, j]:
+                if not math.isclose(element, other[i, j], abs_tol=1e-7):
                     return False
             try:
                 _ = other[i, len(row) + 1]

test/test_book/test_chapter4.py

@@ -1,6 +1,7 @@
 import numpy
 from hypothesis import given
 from hypothesis import strategies as st
+from hypothesis.strategies import floats
 from hypothesis.strategies import integers
 from hypothesis.strategies import lists
 
@@ -17,10 +18,10 @@ class TestChapter4(ClrsTestCase):
     def test_matrix_multiply(self, data):
         n = data.draw(integers(min_value=1, max_value=15), label="Matrices dimension")
         elements1 = data.draw(
-            lists(lists(integers(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
+            lists(lists(floats(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
             label="First matrix elements")
         elements2 = data.draw(
-            lists(lists(integers(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
+            lists(lists(floats(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
             label="Second matrix elements")
         A = create_matrix(elements1)
         B = create_matrix(elements2)
@@ -36,10 +37,10 @@ def test_matrix_multiply_recursive(self, data):
         k = data.draw(integers(min_value=0, max_value=4), label="Matrices dimension exponent")
         n = 2 ** k
         elements1 = data.draw(
-            lists(lists(integers(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
+            lists(lists(floats(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
             label="First matrix elements")
         elements2 = data.draw(
-            lists(lists(integers(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
+            lists(lists(floats(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
             label="Second matrix elements")
         A = create_matrix(elements1)
         B = create_matrix(elements2)

test/test_solutions/test_chapter4.py

@@ -3,6 +3,7 @@
 from hypothesis import given
 from hypothesis import strategies as st
 from hypothesis.strategies import complex_numbers
+from hypothesis.strategies import floats
 from hypothesis.strategies import integers
 from hypothesis.strategies import lists
 from hypothesis.strategies import sampled_from
@@ -40,10 +41,10 @@ class TestChapter4(ClrsTestCase):
     def test_matrix_multiply_recursive_general(self, data):
         n = data.draw(integers(min_value=1, max_value=15), label="Matrices dimension")
         elements1 = data.draw(
-            lists(lists(integers(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
+            lists(lists(floats(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
             label="First matrix elements")
         elements2 = data.draw(
-            lists(lists(integers(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
+            lists(lists(floats(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
             label="Second matrix elements")
         A = create_matrix(elements1)
         B = create_matrix(elements2)
@@ -59,10 +60,10 @@ def test_matrix_multiply_recursive_by_copying(self, data):
         k = data.draw(integers(min_value=0, max_value=4), label="Matrices dimension exponent")
         n = 2 ** k
         elements1 = data.draw(
-            lists(lists(integers(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
+            lists(lists(floats(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
             label="First matrix elements")
         elements2 = data.draw(
-            lists(lists(integers(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
+            lists(lists(floats(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
             label="Second matrix elements")
         A = create_matrix(elements1)
         B = create_matrix(elements2)
@@ -78,10 +79,10 @@ def test_matrix_add_recursive(self, data):
         k = data.draw(integers(min_value=0, max_value=4), label="Matrices dimension exponent")
         n = 2 ** k
         elements1 = data.draw(
-            lists(lists(integers(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
+            lists(lists(floats(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
             label="First matrix elements")
         elements2 = data.draw(
-            lists(lists(integers(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
+            lists(lists(floats(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
             label="Second matrix elements")
         A = create_matrix(elements1)
         B = create_matrix(elements2)
@@ -97,10 +98,10 @@ def test_strassen(self, data):
         k = data.draw(integers(min_value=0, max_value=4), label="Matrices dimension exponent")
         n = 2 ** k
         elements1 = data.draw(
-            lists(lists(integers(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
+            lists(lists(floats(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
             label="First matrix elements")
         elements2 = data.draw(
-            lists(lists(integers(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
+            lists(lists(floats(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
             label="Second matrix elements")
         A = create_matrix(elements1)
         B = create_matrix(elements2)
@@ -126,10 +127,10 @@ def test_complex_multiply(self, data):
     def test_matrix_multiply_by_squaring(self, data):
         n = data.draw(integers(min_value=1, max_value=15), label="Matrices dimension")
         elements1 = data.draw(
-            lists(lists(integers(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
+            lists(lists(floats(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
             label="First matrix elements")
         elements2 = data.draw(
-            lists(lists(integers(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
+            lists(lists(floats(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=n, max_size=n),
             label="Second matrix elements")
         A = create_matrix(elements1)
         B = create_matrix(elements2)
@@ -162,7 +163,7 @@ def test_monge_leftmost_minimums(self, data):
         m = data.draw(integers(min_value=1, max_value=15), label="Monge array row dimension")
         n = data.draw(integers(min_value=1, max_value=15), label="Monge array column dimension")
         elements = data.draw(
-            lists(lists(integers(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=m, max_size=m),
+            lists(lists(floats(min_value=-1000, max_value=1000), min_size=n, max_size=n), min_size=m, max_size=m),
             label="Monge array elements")
         A = create_matrix(elements)
         assume(is_monge_array(A, m, n))

test/test_util.py

@@ -21,7 +21,7 @@ def create_array(elements: list[T], start: int = 1) -> Array[T]:
     return array
 
 
-def create_matrix(elements: list[list[int]]) -> Matrix:
+def create_matrix(elements: list[list[float]]) -> Matrix:
     rows = len(elements)
     cols = len(elements[0])
     matrix = Matrix(rows, cols)