Skip to content

Commit 5229c74

Browse files
authored
[mypy] Fix directory arithmetic_analysis (#4304)
* fix directory arithmetic_analysis * Update build.yml * temporary fix for psf/black bug see psf/black#2079 * Update in_static_equilibrium.py
1 parent 895bca3 commit 5229c74

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

Diff for: .github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
python -m pip install mypy pytest-cov -r requirements.txt
2424
# FIXME: #4052 fix mypy errors in the exclude directories and remove them below
2525
- run: mypy --ignore-missing-imports
26-
--exclude '(arithmetic_analysis|ciphers|conversions|data_structures|digital_image_processing|dynamic_programming|graphs|hashes|linear_algebra|maths|matrix|other|project_euler|scripts|searches|strings*)/$' .
26+
--exclude '(ciphers|conversions|data_structures|digital_image_processing|dynamic_programming|graphs|hashes|linear_algebra|maths|matrix|other|project_euler|scripts|searches|strings*)/$' .
2727
- name: Run tests
2828
run: pytest --doctest-modules --ignore=project_euler/ --ignore=scripts/ --cov-report=term-missing:skip-covered --cov=. .
2929
- if: ${{ success() }}

Diff for: .github/workflows/pre-commit.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
~/.cache/pip
1515
key: ${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
1616
- uses: actions/setup-python@v2
17-
- uses: psf/black@stable
17+
- uses: psf/black@20.8b1
1818
- name: Install pre-commit
1919
run: |
2020
python -m pip install --upgrade pip

Diff for: arithmetic_analysis/gaussian_elimination.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import numpy as np
88

99

10-
def retroactive_resolution(coefficients: np.matrix, vector: np.array) -> np.array:
10+
def retroactive_resolution(coefficients: np.matrix, vector: np.ndarray) -> np.ndarray:
1111
"""
1212
This function performs a retroactive linear system resolution
1313
for triangular matrix
@@ -38,7 +38,7 @@ def retroactive_resolution(coefficients: np.matrix, vector: np.array) -> np.arra
3838
return x
3939

4040

41-
def gaussian_elimination(coefficients: np.matrix, vector: np.array) -> np.array:
41+
def gaussian_elimination(coefficients: np.matrix, vector: np.ndarray) -> np.ndarray:
4242
"""
4343
This function performs Gaussian elimination method
4444
@@ -57,7 +57,7 @@ def gaussian_elimination(coefficients: np.matrix, vector: np.array) -> np.array:
5757
# coefficients must to be a square matrix so we need to check first
5858
rows, columns = np.shape(coefficients)
5959
if rows != columns:
60-
return []
60+
return np.array((), dtype=float)
6161

6262
# augmented matrix
6363
augmented_mat = np.concatenate((coefficients, vector), axis=1)

Diff for: arithmetic_analysis/in_static_equilibrium.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"""
44
from typing import List
55

6-
from numpy import array, cos, cross, radians, sin
6+
from numpy import array, cos, cross, ndarray, radians, sin
77

88

99
def polar_force(
@@ -23,7 +23,7 @@ def polar_force(
2323

2424

2525
def in_static_equilibrium(
26-
forces: array, location: array, eps: float = 10 ** -1
26+
forces: ndarray, location: ndarray, eps: float = 10 ** -1
2727
) -> bool:
2828
"""
2929
Check if a system is in equilibrium.
@@ -42,7 +42,7 @@ def in_static_equilibrium(
4242
False
4343
"""
4444
# summation of moments is zero
45-
moments: array = cross(location, forces)
45+
moments: ndarray = cross(location, forces)
4646
sum_moments: float = sum(moments)
4747
return abs(sum_moments) < eps
4848

0 commit comments

Comments
 (0)