[mypy] Fix matrix_operation.py (#5808)

* Update matrix_operation.py

* Update mypy.ini

* Update DIRECTORY.md

* formatting

* Update matrix_operation.py

* doctest for exception

* A bit more...
This commit is contained in:
Rohan R Bharadwaj 2021-11-10 20:52:52 +05:30 committed by GitHub
parent d6a1623448
commit e9882e41ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 10 deletions

View File

@ -854,6 +854,8 @@
* [Sol1](https://github.com/TheAlgorithms/Python/blob/master/project_euler/problem_135/sol1.py) * [Sol1](https://github.com/TheAlgorithms/Python/blob/master/project_euler/problem_135/sol1.py)
* Problem 144 * Problem 144
* [Sol1](https://github.com/TheAlgorithms/Python/blob/master/project_euler/problem_144/sol1.py) * [Sol1](https://github.com/TheAlgorithms/Python/blob/master/project_euler/problem_144/sol1.py)
* Problem 145
* [Sol1](https://github.com/TheAlgorithms/Python/blob/master/project_euler/problem_145/sol1.py)
* Problem 173 * Problem 173
* [Sol1](https://github.com/TheAlgorithms/Python/blob/master/project_euler/problem_173/sol1.py) * [Sol1](https://github.com/TheAlgorithms/Python/blob/master/project_euler/problem_173/sol1.py)
* Problem 174 * Problem 174

View File

@ -13,11 +13,16 @@ def add(*matrix_s: list[list]) -> list[list]:
[[3.2, 5.4], [7, 9]] [[3.2, 5.4], [7, 9]]
>>> add([[1, 2], [4, 5]], [[3, 7], [3, 4]], [[3, 5], [5, 7]]) >>> add([[1, 2], [4, 5]], [[3, 7], [3, 4]], [[3, 5], [5, 7]])
[[7, 14], [12, 16]] [[7, 14], [12, 16]]
>>> add([3], [4, 5])
Traceback (most recent call last):
...
TypeError: Expected a matrix, got int/list instead
""" """
if all(_check_not_integer(m) for m in matrix_s): if all(_check_not_integer(m) for m in matrix_s):
for i in matrix_s[1:]: for i in matrix_s[1:]:
_verify_matrix_sizes(matrix_s[0], i) _verify_matrix_sizes(matrix_s[0], i)
return [[sum(t) for t in zip(*m)] for m in zip(*matrix_s)] return [[sum(t) for t in zip(*m)] for m in zip(*matrix_s)]
raise TypeError("Expected a matrix, got int/list instead")
def subtract(matrix_a: list[list], matrix_b: list[list]) -> list[list]: def subtract(matrix_a: list[list], matrix_b: list[list]) -> list[list]:
@ -26,6 +31,10 @@ def subtract(matrix_a: list[list], matrix_b: list[list]) -> list[list]:
[[-1, -1], [-1, -1]] [[-1, -1], [-1, -1]]
>>> subtract([[1,2.5],[3,4]],[[2,3],[4,5.5]]) >>> subtract([[1,2.5],[3,4]],[[2,3],[4,5.5]])
[[-1, -0.5], [-1, -1.5]] [[-1, -0.5], [-1, -1.5]]
>>> subtract([3], [4, 5])
Traceback (most recent call last):
...
TypeError: Expected a matrix, got int/list instead
""" """
if ( if (
_check_not_integer(matrix_a) _check_not_integer(matrix_a)
@ -33,9 +42,10 @@ def subtract(matrix_a: list[list], matrix_b: list[list]) -> list[list]:
and _verify_matrix_sizes(matrix_a, matrix_b) and _verify_matrix_sizes(matrix_a, matrix_b)
): ):
return [[i - j for i, j in zip(*m)] for m in zip(matrix_a, matrix_b)] return [[i - j for i, j in zip(*m)] for m in zip(matrix_a, matrix_b)]
raise TypeError("Expected a matrix, got int/list instead")
def scalar_multiply(matrix: list[list], n: int) -> list[list]: def scalar_multiply(matrix: list[list], n: int | float) -> list[list]:
""" """
>>> scalar_multiply([[1,2],[3,4]],5) >>> scalar_multiply([[1,2],[3,4]],5)
[[5, 10], [15, 20]] [[5, 10], [15, 20]]
@ -79,18 +89,23 @@ def identity(n: int) -> list[list]:
return [[int(row == column) for column in range(n)] for row in range(n)] return [[int(row == column) for column in range(n)] for row in range(n)]
def transpose(matrix: list[list], return_map: bool = True) -> list[list]: def transpose(matrix: list[list], return_map: bool = True) -> list[list] | map[list]:
""" """
>>> transpose([[1,2],[3,4]]) # doctest: +ELLIPSIS >>> transpose([[1,2],[3,4]]) # doctest: +ELLIPSIS
<map object at ... <map object at ...
>>> transpose([[1,2],[3,4]], return_map=False) >>> transpose([[1,2],[3,4]], return_map=False)
[[1, 3], [2, 4]] [[1, 3], [2, 4]]
>>> transpose([1, [2, 3]])
Traceback (most recent call last):
...
TypeError: Expected a matrix, got int/list instead
""" """
if _check_not_integer(matrix): if _check_not_integer(matrix):
if return_map: if return_map:
return map(list, zip(*matrix)) return map(list, zip(*matrix))
else: else:
return list(map(list, zip(*matrix))) return list(map(list, zip(*matrix)))
raise TypeError("Expected a matrix, got int/list instead")
def minor(matrix: list[list], row: int, column: int) -> list[list]: def minor(matrix: list[list], row: int, column: int) -> list[list]:
@ -118,7 +133,7 @@ def determinant(matrix: list[list]) -> int:
) )
def inverse(matrix: list[list]) -> list[list]: def inverse(matrix: list[list]) -> list[list] | None:
""" """
>>> inverse([[1, 2], [3, 4]]) >>> inverse([[1, 2], [3, 4]])
[[-2.0, 1.0], [1.5, -0.5]] [[-2.0, 1.0], [1.5, -0.5]]
@ -138,21 +153,21 @@ def inverse(matrix: list[list]) -> list[list]:
[x * (-1) ** (row + col) for col, x in enumerate(matrix_minor[row])] [x * (-1) ** (row + col) for col, x in enumerate(matrix_minor[row])]
for row in range(len(matrix)) for row in range(len(matrix))
] ]
adjugate = transpose(cofactors) adjugate = list(transpose(cofactors))
return scalar_multiply(adjugate, 1 / det) return scalar_multiply(adjugate, 1 / det)
def _check_not_integer(matrix: list[list]) -> bool: def _check_not_integer(matrix: list[list]) -> bool:
if not isinstance(matrix, int) and not isinstance(matrix[0], int): return not isinstance(matrix, int) and not isinstance(matrix[0], int)
return True
raise TypeError("Expected a matrix, got int/list instead")
def _shape(matrix: list[list]) -> list: def _shape(matrix: list[list]) -> tuple[int, int]:
return len(matrix), len(matrix[0]) return len(matrix), len(matrix[0])
def _verify_matrix_sizes(matrix_a: list[list], matrix_b: list[list]) -> tuple[list]: def _verify_matrix_sizes(
matrix_a: list[list], matrix_b: list[list]
) -> tuple[tuple, tuple]:
shape = _shape(matrix_a) + _shape(matrix_b) shape = _shape(matrix_a) + _shape(matrix_b)
if shape[0] != shape[3] or shape[1] != shape[2]: if shape[0] != shape[3] or shape[1] != shape[2]:
raise ValueError( raise ValueError(

View File

@ -2,4 +2,4 @@
ignore_missing_imports = True ignore_missing_imports = True
install_types = True install_types = True
non_interactive = True non_interactive = True
exclude = (matrix_operation.py|other/least_recently_used.py|other/lfu_cache.py|other/lru_cache.py) exclude = (other/least_recently_used.py|other/lfu_cache.py|other/lru_cache.py)