Merge branch 'develop'

Author: codejsha

README.md

@@ -6,14 +6,14 @@
 
 [English](README.md) | [Korean](README_ko-KR.md)
 
-This repository is an implementation of algorithms, data structures, and problem solving. These are written in C++, Python, and Java, and each language uses the following test framework: [Google Test](https://google.github.io/googletest/)(C++), [pytest](https://docs.pytest.org/)(Python), [JUnit](https://junit.org/)(Java). Run tests to perform methods/functions on the algorithmic logic. GitHub Actions workflows that build and test code run manually.
+This repository is an implementation of algorithms, data structures, and problem-solving. These are written in C++, Python, and Java, and each language uses the following test framework: [Google Test](https://google.github.io/googletest/)(C++), [pytest](https://docs.pytest.org/)(Python), [JUnit](https://junit.org/)(Java). Run tests to perform methods/functions on the algorithmic logic. GitHub Actions workflows that build and test code run manually.
 
 ## Project Environments
 
 Each project is configured in specific environments, as described below:
 
 - C++ project: C++20 / [CMake](https://cmake.org/) build / [GNU Scientific Library (GSL)](https://www.gnu.org/software/gsl/), [Google Test](https://google.github.io/googletest/), [Google Benchmark](https://github.com/google/benchmark), [fmt](https://github.com/fmtlib/fmt) packages / [vcpkg](https://github.com/microsoft/vcpkg) package manager
-- Python project: Python 3.11 / [Poetry](https://python-poetry.org/) / [NumPy](https://numpy.org/), [SciPy](https://www.scipy.org/), [pytest](https://docs.pytest.org/), [pytest-benchmark](https://pytest-benchmark.readthedocs.io/en/latest/) packages
+- Python project: Python 3.11 / [Poetry](https://python-poetry.org/) / [NumPy](https://numpy.org/), [SciPy](https://www.scipy.org/), [NetworkX](https://networkx.org/), [pytest](https://docs.pytest.org/), [pytest-benchmark](https://pytest-benchmark.readthedocs.io/en/latest/) packages
 - Java project: Java 17 / [Gradle](https://gradle.org/) build / [JUnit](https://junit.org/), [Java Microbenchmark Harness (JMH)](https://github.com/openjdk/jmh) libraries
 
 ## Table of Contents

README_ko-KR.md

@@ -13,5 +13,5 @@
 각 프로젝트는 다음과 같은 환경에서 구성되었습니다:
 
 - C++ project: C++20 / [CMake](https://cmake.org/) build / [GNU Scientific Library (GSL)](https://www.gnu.org/software/gsl/), [Google Test](https://google.github.io/googletest/), [Google Benchmark](https://github.com/google/benchmark), [fmt](https://github.com/fmtlib/fmt) packages / [vcpkg](https://github.com/microsoft/vcpkg) package manager
-- Python project: Python 3.11 / [Poetry](https://python-poetry.org/) / [NumPy](https://numpy.org/), [SciPy](https://www.scipy.org/), [pytest](https://docs.pytest.org/), [pytest-benchmark](https://pytest-benchmark.readthedocs.io/en/latest/) packages
+- Python project: Python 3.11 / [Poetry](https://python-poetry.org/) / [NumPy](https://numpy.org/), [SciPy](https://www.scipy.org/), [NetworkX](https://networkx.org/), [pytest](https://docs.pytest.org/), [pytest-benchmark](https://pytest-benchmark.readthedocs.io/en/latest/) packages
 - Java project: Java 17 / [Gradle](https://gradle.org/) build / [JUnit](https://junit.org/), [Java Microbenchmark Harness (JMH)](https://github.com/openjdk/jmh) libraries

python-algorithm/.gitignore

@@ -589,5 +589,4 @@ FodyWeavers.xsd
 ### Others
 
 .idea/
-poetry.lock
 README_link.md

python-algorithm/algorithm/greedy/test/__init__.py

@@ -4,10 +4,13 @@
 
 
 @pytest.mark.benchmark(group="cashier_change")
-@pytest.mark.parametrize("denominations, price, expected", [
-    ([25, 10, 5, 1], 30, 2),
-    ([25, 10, 5, 1], 24, 6),
-], ids=["successful1", "successful2"])
+@pytest.mark.parametrize(
+    argnames="denominations, price, expected",
+    argvalues=[
+        ([25, 10, 5, 1], 30, 2),
+        ([25, 10, 5, 1], 24, 6)
+    ],
+    ids=["case1", "case2"])
 def test_cashier_change(benchmark, denominations, price, expected):
     result = benchmark(cashier_change, denominations, price)
     assert expected == result

…/algorithm/greedy/test_cashier_change.py …rithm/greedy/test/test_cashier_change.pypython-algorithm/algorithm/greedy/test_cashier_change.py renamed to python-algorithm/algorithm/greedy/test/test_cashier_change.py python-algorithm/algorithm/greedy/test_cashier_change.py renamed to python-algorithm/algorithm/greedy/test/test_cashier_change.py

@@ -16,9 +16,10 @@
 
 
 @pytest.mark.benchmark(group="interval_scheduling_lecture")
-@pytest.mark.parametrize("lectures, expected", [
-    ([lecture1, lecture2, lecture3], [lecture2, lecture3]),
-], ids=["successful"])
+@pytest.mark.parametrize(
+    argnames="lectures, expected",
+    argvalues=[([lecture1, lecture2, lecture3], [lecture2, lecture3])],
+    ids=["case1"])
 def test_interval_scheduling_lecture(benchmark, lectures, expected):
     result = benchmark(interval_scheduling_lecture, lectures)
     assert expected == result

…gorithm/greedy/test_interval_schedule.py …hm/greedy/test/test_interval_schedule.pypython-algorithm/algorithm/greedy/test_interval_schedule.py renamed to python-algorithm/algorithm/greedy/test/test_interval_schedule.py python-algorithm/algorithm/greedy/test_interval_schedule.py renamed to python-algorithm/algorithm/greedy/test/test_interval_schedule.py

@@ -4,9 +4,10 @@
 
 
 @pytest.mark.benchmark(group="addition_of_binary_number")
-@pytest.mark.parametrize("a, b, expected", [
-    ('1110', '1011', '11001'),
-], ids=["successful"])
+@pytest.mark.parametrize(
+    argnames="a, b, expected",
+    argvalues=[('1110', '1011', '11001')],
+    ids=["case1"])
 def test_addition_of_binary_number(benchmark, a, b, expected):
     result = benchmark(addition_binary_number, a, b)
     assert expected == result

python-algorithm/algorithm/math/test/__init__.py

@@ -4,11 +4,14 @@
 
 
 @pytest.mark.benchmark(group="base_expansion")
-@pytest.mark.parametrize("number, base, expected", [
-    (12345, 8, '30071'),
-    (177130, 16, '2B3EA'),
-    (241, 2, '11110001'),
-], ids=["base8", "base16", "base2"])
+@pytest.mark.parametrize(
+    argnames="number, base, expected",
+    argvalues=[
+        (12345, 8, '30071'),
+        (177130, 16, '2B3EA'),
+        (241, 2, '11110001')
+    ],
+    ids=["base8", "base16", "base2"])
 def test_base_expansion(benchmark, number, base, expected):
     result = benchmark(base_expansion, number, base)
     assert expected == result

…/algorithm/math/test_addition_integer.py …rithm/math/test/test_addition_integer.pypython-algorithm/algorithm/math/test_addition_integer.py renamed to python-algorithm/algorithm/math/test/test_addition_integer.py python-algorithm/algorithm/math/test_addition_integer.py renamed to python-algorithm/algorithm/math/test/test_addition_integer.py

@@ -4,35 +4,41 @@
 
 
 @pytest.mark.benchmark(group="gcd_euclidean")
-@pytest.mark.parametrize("pair, expected", [
-    ((24, 36), 12),
-    ((17, 22), 1),
-    ((120, 500), 20),
-])
+@pytest.mark.parametrize(
+    argnames="pair, expected",
+    argvalues=[
+        ((24, 36), 12),
+        ((17, 22), 1),
+        ((120, 500), 20)
+    ])
 def test_gcd_euclidean(benchmark, pair, expected):
     assert is_positive_integer(*pair) is True
     result = benchmark(gcd_euclidean, *pair)
     assert expected == result
 
 
 @pytest.mark.benchmark(group="gcd_euclidean_divmod")
-@pytest.mark.parametrize("pair, expected", [
-    ((24, 36), 12),
-    ((17, 22), 1),
-    ((120, 500), 20),
-])
+@pytest.mark.parametrize(
+    argnames="pair, expected",
+    argvalues=[
+        ((24, 36), 12),
+        ((17, 22), 1),
+        ((120, 500), 20)
+    ])
 def test_gcd_euclidean_divmod(benchmark, pair, expected):
     assert is_positive_integer(*pair) is True
     result = benchmark(gcd_euclidean_divmod, *pair)
     assert expected == result
 
 
 @pytest.mark.benchmark(group="gcd_extended_euclidean")
-@pytest.mark.parametrize("pair, expected", [
-    ((24, 36), (12, -1, 1)),
-    ((17, 22), (1, -9, 7)),
-    ((120, 500), (20, -4, 1)),
-])
+@pytest.mark.parametrize(
+    argnames="pair, expected",
+    argvalues=[
+        ((24, 36), (12, -1, 1)),
+        ((17, 22), (1, -9, 7)),
+        ((120, 500), (20, -4, 1))
+    ])
 def test_gcd_extended_euclidean(benchmark, pair, expected):
     assert is_positive_integer(*pair) is True
     result = benchmark(gcd_extended_euclidean, *pair)