Skip to content

Commit 81d293d

Browse files
KrekepKrekep
committed
[Test] Data restructuring for Python tests
- Move matrices for tests from python/tests/matrices to python/data - Change input matrix format to .mtx
1 parent 94bbd51 commit 81d293d

10 files changed

+29
-25
lines changed

‎python/tests/test_duplicate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ def test_duplicate(self):
77
"""
88
Unit test for duplicate of matrix
99
"""
10-
first_matrix = test_utils.build_matrix_from_file("matrices/duplicate.txt")
10+
first_matrix = test_utils.build_matrix_from_file("../data/duplicate.mtx")
1111

1212
actual_matrix = first_matrix.dup()
1313

‎python/tests/test_extract_matrix.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ def test_extract_matrix(self):
77
"""
88
Unit test for extract submatrix from left-upper corner of matrix
99
"""
10-
first_matrix = test_utils.build_matrix_from_file("matrices/extract_matrix.txt")
11-
expected_matrix = test_utils.build_matrix_from_file("matrices/extract_matrix_result.txt")
10+
first_matrix = test_utils.build_matrix_from_file("../data/extract_matrix.mtx")
11+
expected_matrix = test_utils.build_matrix_from_file("../data/extract_matrix_result.mtx")
1212

1313
actual_matrix = first_matrix.extract_matrix(0, 0, expected_matrix.shape)
1414

‎python/tests/test_kronecker.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ def test_kronecker(self):
77
"""
88
Unit test for kronecker product of two matrices
99
"""
10-
first_matrix = test_utils.build_matrix_from_file("matrices/kronecker_4.txt")
11-
second_matrix = test_utils.build_matrix_from_file("matrices/kronecker_5.txt")
10+
first_matrix = test_utils.build_matrix_from_file("../data/kronecker_1.mtx")
11+
second_matrix = test_utils.build_matrix_from_file("../data/kronecker_2.mtx")
1212

1313
actual_matrix = first_matrix.kronecker(second_matrix)
14-
expected_matrix = test_utils.build_matrix_from_file("matrices/kronecker_result.txt")
14+
expected_matrix = test_utils.build_matrix_from_file("../data/kronecker_result.mtx")
1515

1616
self.assertTrue(test_utils.compare_matrix(expected_matrix, actual_matrix))
1717

‎python/tests/test_matrix_add.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ def test_add(self):
77
"""
88
Unit test for addition of two matrices
99
"""
10-
first_matrix = test_utils.build_matrix_from_file("matrices/add_1.txt")
11-
second_matrix = test_utils.build_matrix_from_file("matrices/add_2.txt")
10+
first_matrix = test_utils.build_matrix_from_file("../data/add_1.mtx")
11+
second_matrix = test_utils.build_matrix_from_file("../data/add_2.mtx")
1212

1313
actual_matrix = first_matrix.ewiseadd(second_matrix)
14-
expected_matrix = test_utils.build_matrix_from_file("matrices/add_result.txt")
14+
expected_matrix = test_utils.build_matrix_from_file("../data/add_result.mtx")
1515

1616
self.assertTrue(test_utils.compare_matrix(expected_matrix, actual_matrix))
1717

‎python/tests/test_matrix_mxm.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ def test_mxm(self):
77
"""
88
Unit test for multiplication of two matrices
99
"""
10-
first_matrix = test_utils.build_matrix_from_file("matrices/mxm_1.txt")
11-
second_matrix = test_utils.build_matrix_from_file("matrices/mxm_2.txt")
10+
first_matrix = test_utils.build_matrix_from_file("../data/mxm_1.mtx")
11+
second_matrix = test_utils.build_matrix_from_file("../data/mxm_2.mtx")
1212

1313
actual_matrix = first_matrix.mxm(second_matrix)
14-
expected_matrix = test_utils.build_matrix_from_file("matrices/mxm_result.txt")
14+
expected_matrix = test_utils.build_matrix_from_file("../data/mxm_result.mtx")
1515

1616
self.assertTrue(test_utils.compare_matrix(expected_matrix, actual_matrix))
1717

‎python/tests/test_matrix_properties.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
class TestMatrixMethods(unittest.TestCase):
66

77
def setUp(self) -> None:
8-
self.matrix = test_utils.build_matrix_from_file("matrices/property.txt")
8+
self.matrix = test_utils.build_matrix_from_file("../data/property.mtx")
99
self.result_property = list()
10-
with open("/matrices/property_result.txt", 'r') as _file:
10+
with open("/matrices/property_result.mtx", 'r') as _file:
1111
line = list(map(int, _file.readline().split()))
1212
self.result_property.append(line)
1313

‎python/tests/test_reduce.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ def test_reduce(self):
77
"""
88
Unit test for reduce of matrix
99
"""
10-
first_matrix = test_utils.build_matrix_from_file("matrices/reduce.txt")
10+
first_matrix = test_utils.build_matrix_from_file("../data/reduce.mtx")
1111

1212
actual_matrix = first_matrix.reduce()
13-
expected_matrix = test_utils.build_matrix_from_file("matrices/reduce_result.txt")
13+
expected_matrix = test_utils.build_matrix_from_file("../data/reduce_result.mtx")
1414

1515
self.assertTrue(test_utils.compare_matrix(expected_matrix, actual_matrix))
1616

‎python/tests/test_to_lists.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
class TestMatrixToLists(unittest.TestCase):
66
def setUp(self) -> None:
7-
self.matrix = test_utils.build_matrix_from_file("matrices/to_lists.txt")
7+
self.matrix = test_utils.build_matrix_from_file("../data/to_lists.mtx")
88
self.result_lists = list()
9-
with open("matrices/to_lists_result.txt", 'r') as _file:
9+
with open("../data/to_lists_result.mtx", 'r') as _file:
1010
line = list(map(int, _file.readline().split()))
1111
self.result_lists.append(line)
1212

‎python/tests/test_transpose.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ def test_transpose(self):
77
"""
88
Unit test for transpose of matrix
99
"""
10-
first_matrix = test_utils.build_matrix_from_file("matrices/transpose.txt")
10+
first_matrix = test_utils.build_matrix_from_file("../data/transpose.mtx")
1111

1212
actual_matrix = first_matrix.transpose()
13-
expected_matrix = test_utils.build_matrix_from_file("matrices/transpose_result.txt")
13+
expected_matrix = test_utils.build_matrix_from_file("../data/transpose_result.mtx")
1414

1515
self.assertTrue(test_utils.compare_matrix(expected_matrix, actual_matrix))
1616

‎python/tests/test_utils.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11
import pycubool
22

33

4-
def _read_matrix(path: str):
4+
def _read_matrix_mtx(path: str):
55
"""
66
Read matrix from file
77
"""
88
with open(path, 'r') as file:
9-
n, m = map(int, file.readline().split())
10-
rows = list(map(int, file.readline().split()))
11-
cols = list(map(int, file.readline().split()))
9+
n, m, nvals = map(int, file.readline().split())
10+
rows = list()
11+
cols = list()
12+
for k in range(nvals):
13+
i, j = map(int, file.readline().split())
14+
rows.append(i)
15+
cols.append(j)
1216
return n, m, [rows, cols]
1317

1418

1519
def build_matrix_from_file(path: str) -> pycubool.Matrix:
16-
n, m, matrix = _read_matrix(path)
20+
n, m, matrix = _read_matrix_mtx(path)
1721
nvals = len(matrix[0])
1822
result = pycubool.Matrix.empty([n, m])
1923
result.build(matrix[0], matrix[1], nvals)

0 commit comments

Comments
 (0)