From eccea262c10ff0e2fe6a5c6dbaf13a8be2371dca Mon Sep 17 00:00:00 2001 From: quant12345 Date: Fri, 29 Sep 2023 17:50:16 +0500 Subject: [PATCH 01/10] Replacing the generator with numpy vector operations from lu_decomposition. --- arithmetic_analysis/lu_decomposition.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arithmetic_analysis/lu_decomposition.py b/arithmetic_analysis/lu_decomposition.py index eaabce5449c5..094b20abfecc 100644 --- a/arithmetic_analysis/lu_decomposition.py +++ b/arithmetic_analysis/lu_decomposition.py @@ -88,15 +88,19 @@ def lower_upper_decomposition(table: np.ndarray) -> tuple[np.ndarray, np.ndarray lower = np.zeros((rows, columns)) upper = np.zeros((rows, columns)) + + # in 'total', the necessary data is extracted through slices + # and the sum of the products is obtained. + for i in range(columns): for j in range(i): - total = sum(lower[i][k] * upper[k][j] for k in range(j)) + total = np.sum(lower[i, :i] * upper[:i, j]) if upper[j][j] == 0: raise ArithmeticError("No LU decomposition exists") lower[i][j] = (table[i][j] - total) / upper[j][j] lower[i][i] = 1 for j in range(i, columns): - total = sum(lower[i][k] * upper[k][j] for k in range(j)) + total = np.sum(lower[i, :i] * upper[:i, j]) upper[i][j] = table[i][j] - total return lower, upper From 4e347233906017f5b96bd53a1ac6da4bdc40ab8e Mon Sep 17 00:00:00 2001 From: quant12345 Date: Fri, 29 Sep 2023 17:53:57 +0500 Subject: [PATCH 02/10] Revert "Replacing the generator with numpy vector operations from lu_decomposition." This reverts commit ad217c66165898d62b76cc89ba09c2d7049b6448. --- arithmetic_analysis/lu_decomposition.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/arithmetic_analysis/lu_decomposition.py b/arithmetic_analysis/lu_decomposition.py index 094b20abfecc..eaabce5449c5 100644 --- a/arithmetic_analysis/lu_decomposition.py +++ b/arithmetic_analysis/lu_decomposition.py @@ -88,19 +88,15 @@ def lower_upper_decomposition(table: np.ndarray) -> tuple[np.ndarray, np.ndarray lower = np.zeros((rows, columns)) upper = np.zeros((rows, columns)) - - # in 'total', the necessary data is extracted through slices - # and the sum of the products is obtained. - for i in range(columns): for j in range(i): - total = np.sum(lower[i, :i] * upper[:i, j]) + total = sum(lower[i][k] * upper[k][j] for k in range(j)) if upper[j][j] == 0: raise ArithmeticError("No LU decomposition exists") lower[i][j] = (table[i][j] - total) / upper[j][j] lower[i][i] = 1 for j in range(i, columns): - total = np.sum(lower[i, :i] * upper[:i, j]) + total = sum(lower[i][k] * upper[k][j] for k in range(j)) upper[i][j] = table[i][j] - total return lower, upper From 93dfe613b64aa401c6487249bba55569d5d32525 Mon Sep 17 00:00:00 2001 From: quant12345 Date: Mon, 9 Oct 2023 15:29:13 +0500 Subject: [PATCH 03/10] Replaced lena.jpg with lena_small.jpg to make tests faster. --- digital_image_processing/test_digital_image_processing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/digital_image_processing/test_digital_image_processing.py b/digital_image_processing/test_digital_image_processing.py index 528b4bc3b74c..f63f33b3e395 100644 --- a/digital_image_processing/test_digital_image_processing.py +++ b/digital_image_processing/test_digital_image_processing.py @@ -96,7 +96,7 @@ def test_nearest_neighbour( def test_local_binary_pattern(): - file_path = "digital_image_processing/image_data/lena.jpg" + file_path = "digital_image_processing/image_data/lena_small.jpg" # Reading the image and converting it to grayscale. image = imread(file_path, 0) From f50bcaeb32270043791734e3f11eae8b2651f927 Mon Sep 17 00:00:00 2001 From: Kamil <32775019+quant12345@users.noreply.github.com> Date: Mon, 9 Oct 2023 19:29:27 +0500 Subject: [PATCH 04/10] Update digital_image_processing/test_digital_image_processing.py Co-authored-by: Christian Clauss --- digital_image_processing/test_digital_image_processing.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/digital_image_processing/test_digital_image_processing.py b/digital_image_processing/test_digital_image_processing.py index f63f33b3e395..a4c9f5135710 100644 --- a/digital_image_processing/test_digital_image_processing.py +++ b/digital_image_processing/test_digital_image_processing.py @@ -96,7 +96,9 @@ def test_nearest_neighbour( def test_local_binary_pattern(): - file_path = "digital_image_processing/image_data/lena_small.jpg" + from os import getenv # Speed up our Continuous Integration tests + file_name = "lena_small.jpg" if getenv("CI") else "lena.jpg" + file_path = f"digital_image_processing/image_data/{file_name}.jpg" # Reading the image and converting it to grayscale. image = imread(file_path, 0) From b18c17bc99b8e14e5ddde21d0a13fe3a75844feb Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 14:30:14 +0000 Subject: [PATCH 05/10] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- digital_image_processing/test_digital_image_processing.py | 1 + 1 file changed, 1 insertion(+) diff --git a/digital_image_processing/test_digital_image_processing.py b/digital_image_processing/test_digital_image_processing.py index a4c9f5135710..02d5dabbfe71 100644 --- a/digital_image_processing/test_digital_image_processing.py +++ b/digital_image_processing/test_digital_image_processing.py @@ -97,6 +97,7 @@ def test_nearest_neighbour( def test_local_binary_pattern(): from os import getenv # Speed up our Continuous Integration tests + file_name = "lena_small.jpg" if getenv("CI") else "lena.jpg" file_path = f"digital_image_processing/image_data/{file_name}.jpg" From abaca17e58a0ae54e573e243b690f5d8363f8b5c Mon Sep 17 00:00:00 2001 From: Kamil <32775019+quant12345@users.noreply.github.com> Date: Mon, 9 Oct 2023 19:48:42 +0500 Subject: [PATCH 06/10] Update test_digital_image_processing.py tests fail, I'll try an empty commit --- digital_image_processing/test_digital_image_processing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/digital_image_processing/test_digital_image_processing.py b/digital_image_processing/test_digital_image_processing.py index 02d5dabbfe71..8e3785b28cc1 100644 --- a/digital_image_processing/test_digital_image_processing.py +++ b/digital_image_processing/test_digital_image_processing.py @@ -101,7 +101,7 @@ def test_local_binary_pattern(): file_name = "lena_small.jpg" if getenv("CI") else "lena.jpg" file_path = f"digital_image_processing/image_data/{file_name}.jpg" - # Reading the image and converting it to grayscale. + # Reading the image and converting it to grayscale image = imread(file_path, 0) # Test for get_neighbors_pixel function() return not None From 204b73cd2ad09b7a7b521ea2ca028c3ef4c06931 Mon Sep 17 00:00:00 2001 From: Tianyi Zheng Date: Mon, 9 Oct 2023 11:03:33 -0400 Subject: [PATCH 07/10] Apply suggestions from code review --- digital_image_processing/test_digital_image_processing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/digital_image_processing/test_digital_image_processing.py b/digital_image_processing/test_digital_image_processing.py index 8e3785b28cc1..40f547710267 100644 --- a/digital_image_processing/test_digital_image_processing.py +++ b/digital_image_processing/test_digital_image_processing.py @@ -99,7 +99,7 @@ def test_local_binary_pattern(): from os import getenv # Speed up our Continuous Integration tests file_name = "lena_small.jpg" if getenv("CI") else "lena.jpg" - file_path = f"digital_image_processing/image_data/{file_name}.jpg" + file_path = f"digital_image_processing/image_data/{file_name}" # Reading the image and converting it to grayscale image = imread(file_path, 0) From 56b16ba0531c160695daa6af1df3ffdab4ec2c7d Mon Sep 17 00:00:00 2001 From: Kamil <32775019+quant12345@users.noreply.github.com> Date: Mon, 9 Oct 2023 20:09:30 +0500 Subject: [PATCH 08/10] Update test_digital_image_processing.py added clarifications --- digital_image_processing/test_digital_image_processing.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/digital_image_processing/test_digital_image_processing.py b/digital_image_processing/test_digital_image_processing.py index 40f547710267..3921fd4a438d 100644 --- a/digital_image_processing/test_digital_image_processing.py +++ b/digital_image_processing/test_digital_image_processing.py @@ -96,6 +96,11 @@ def test_nearest_neighbour( def test_local_binary_pattern(): + #pull request 10161 before: + #"digital_image_processing/image_data/lena.jpg" + + #after: "digital_image_processing/image_data/lena_small.jpg" + from os import getenv # Speed up our Continuous Integration tests file_name = "lena_small.jpg" if getenv("CI") else "lena.jpg" From ca1bd1073ed347a87c0981865e853dcd82e381f8 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 15:11:26 +0000 Subject: [PATCH 09/10] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .../test_digital_image_processing.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/digital_image_processing/test_digital_image_processing.py b/digital_image_processing/test_digital_image_processing.py index 3921fd4a438d..3510e6c891ea 100644 --- a/digital_image_processing/test_digital_image_processing.py +++ b/digital_image_processing/test_digital_image_processing.py @@ -96,11 +96,11 @@ def test_nearest_neighbour( def test_local_binary_pattern(): - #pull request 10161 before: - #"digital_image_processing/image_data/lena.jpg" - - #after: "digital_image_processing/image_data/lena_small.jpg" - + # pull request 10161 before: + # "digital_image_processing/image_data/lena.jpg" + + # after: "digital_image_processing/image_data/lena_small.jpg" + from os import getenv # Speed up our Continuous Integration tests file_name = "lena_small.jpg" if getenv("CI") else "lena.jpg" From b5d01dea75812c86446484a27f6b0808a9d2a7dd Mon Sep 17 00:00:00 2001 From: Kamil <32775019+quant12345@users.noreply.github.com> Date: Mon, 9 Oct 2023 20:12:07 +0500 Subject: [PATCH 10/10] Update test_digital_image_processing.py --- digital_image_processing/test_digital_image_processing.py | 1 - 1 file changed, 1 deletion(-) diff --git a/digital_image_processing/test_digital_image_processing.py b/digital_image_processing/test_digital_image_processing.py index 3510e6c891ea..2e5630458c8e 100644 --- a/digital_image_processing/test_digital_image_processing.py +++ b/digital_image_processing/test_digital_image_processing.py @@ -98,7 +98,6 @@ def test_nearest_neighbour( def test_local_binary_pattern(): # pull request 10161 before: # "digital_image_processing/image_data/lena.jpg" - # after: "digital_image_processing/image_data/lena_small.jpg" from os import getenv # Speed up our Continuous Integration tests