From 3db24c180fcdce89cd1e4592783b670d1010923e Mon Sep 17 00:00:00 2001 From: algobytewise Date: Fri, 2 Apr 2021 12:42:48 +0530 Subject: [PATCH 1/4] fix directory arithmetic_analysis --- arithmetic_analysis/gaussian_elimination.py | 6 +++--- arithmetic_analysis/in_static_equilibrium.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arithmetic_analysis/gaussian_elimination.py b/arithmetic_analysis/gaussian_elimination.py index 51207686c12a..2dada4fbf9b1 100644 --- a/arithmetic_analysis/gaussian_elimination.py +++ b/arithmetic_analysis/gaussian_elimination.py @@ -7,7 +7,7 @@ import numpy as np -def retroactive_resolution(coefficients: np.matrix, vector: np.array) -> np.array: +def retroactive_resolution(coefficients: np.matrix, vector: np.ndarray) -> np.ndarray: """ This function performs a retroactive linear system resolution for triangular matrix @@ -38,7 +38,7 @@ def retroactive_resolution(coefficients: np.matrix, vector: np.array) -> np.arra return x -def gaussian_elimination(coefficients: np.matrix, vector: np.array) -> np.array: +def gaussian_elimination(coefficients: np.matrix, vector: np.ndarray) -> np.ndarray: """ This function performs Gaussian elimination method @@ -57,7 +57,7 @@ def gaussian_elimination(coefficients: np.matrix, vector: np.array) -> np.array: # coefficients must to be a square matrix so we need to check first rows, columns = np.shape(coefficients) if rows != columns: - return [] + return np.array((), dtype=float) # augmented matrix augmented_mat = np.concatenate((coefficients, vector), axis=1) diff --git a/arithmetic_analysis/in_static_equilibrium.py b/arithmetic_analysis/in_static_equilibrium.py index 9b2892151850..eb72f339e40f 100644 --- a/arithmetic_analysis/in_static_equilibrium.py +++ b/arithmetic_analysis/in_static_equilibrium.py @@ -3,7 +3,7 @@ """ from typing import List -from numpy import array, cos, cross, radians, sin +from numpy import array, cos, cross, radians, sin, ndarray def polar_force( @@ -23,7 +23,7 @@ def polar_force( def in_static_equilibrium( - forces: array, location: array, eps: float = 10 ** -1 + forces: ndarray, location: ndarray, eps: float = 10 ** -1 ) -> bool: """ Check if a system is in equilibrium. @@ -42,7 +42,7 @@ def in_static_equilibrium( False """ # summation of moments is zero - moments: array = cross(location, forces) + moments: ndarray = cross(location, forces) sum_moments: float = sum(moments) return abs(sum_moments) < eps From 93ce41ec75c3401b20ff08ea0eb45673d6c4f9a7 Mon Sep 17 00:00:00 2001 From: algobytewise Date: Fri, 2 Apr 2021 12:43:52 +0530 Subject: [PATCH 2/4] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 76c6357fe0ca..e66b94b1a074 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: python -m pip install mypy pytest-cov -r requirements.txt # FIXME: #4052 fix mypy errors in the exclude directories and remove them below - run: mypy --ignore-missing-imports - --exclude '(arithmetic_analysis|ciphers|conversions|data_structures|digital_image_processing|dynamic_programming|graphs|hashes|linear_algebra|maths|matrix|other|project_euler|scripts|searches|strings*)/$' . + --exclude '(ciphers|conversions|data_structures|digital_image_processing|dynamic_programming|graphs|hashes|linear_algebra|maths|matrix|other|project_euler|scripts|searches|strings*)/$' . - name: Run tests run: pytest --doctest-modules --ignore=project_euler/ --ignore=scripts/ --cov-report=term-missing:skip-covered --cov=. . - if: ${{ success() }} From 511b370d56ce8e8acc4956d4c02ea129c235d16c Mon Sep 17 00:00:00 2001 From: algobytewise Date: Fri, 2 Apr 2021 12:53:13 +0530 Subject: [PATCH 3/4] temporary fix for psf/black bug see https://github.com/psf/black/issues/2079 --- .github/workflows/pre-commit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 17fdad1204e9..dd1a8a945092 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -14,7 +14,7 @@ jobs: ~/.cache/pip key: ${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }} - uses: actions/setup-python@v2 - - uses: psf/black@stable + - uses: psf/black@20.8b1 - name: Install pre-commit run: | python -m pip install --upgrade pip From 1590ec1d75763a02e861f09cac87b1b4cb5b0f79 Mon Sep 17 00:00:00 2001 From: algobytewise Date: Fri, 2 Apr 2021 12:56:32 +0530 Subject: [PATCH 4/4] Update in_static_equilibrium.py --- arithmetic_analysis/in_static_equilibrium.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arithmetic_analysis/in_static_equilibrium.py b/arithmetic_analysis/in_static_equilibrium.py index eb72f339e40f..7b5006a1a82c 100644 --- a/arithmetic_analysis/in_static_equilibrium.py +++ b/arithmetic_analysis/in_static_equilibrium.py @@ -3,7 +3,7 @@ """ from typing import List -from numpy import array, cos, cross, radians, sin, ndarray +from numpy import array, cos, cross, ndarray, radians, sin def polar_force(