From 524aee4b31e2492b859d15d6ec57679207576193 Mon Sep 17 00:00:00 2001 From: Raffaele Date: Sat, 15 Jan 2022 00:29:10 +0100 Subject: [PATCH] Added files for testing loading matrices from files --- tests/dot/t1.txt | 11 ++ tests/scale/t1.txt | 9 ++ tests/test.c | 212 ------------------------------- tests/{test2.c => test_loader.c} | 0 tests/transpose/t1.txt | 9 ++ tests/transpose/t10.txt | 6 + tests/transpose/t2.txt | 9 ++ tests/transpose/t3.txt | 9 ++ tests/transpose/t4.txt | 9 ++ tests/transpose/t5.txt | 9 ++ tests/transpose/t6.txt | 7 + tests/transpose/t7.txt | 7 + tests/transpose/t8.txt | 7 + tests/transpose/t9.txt | 6 + 14 files changed, 98 insertions(+), 212 deletions(-) create mode 100644 tests/dot/t1.txt create mode 100644 tests/scale/t1.txt rename tests/{test2.c => test_loader.c} (100%) create mode 100644 tests/transpose/t1.txt create mode 100644 tests/transpose/t10.txt create mode 100644 tests/transpose/t2.txt create mode 100644 tests/transpose/t3.txt create mode 100644 tests/transpose/t4.txt create mode 100644 tests/transpose/t5.txt create mode 100644 tests/transpose/t6.txt create mode 100644 tests/transpose/t7.txt create mode 100644 tests/transpose/t8.txt create mode 100644 tests/transpose/t9.txt diff --git a/tests/dot/t1.txt b/tests/dot/t1.txt new file mode 100644 index 0000000..89c6d31 --- /dev/null +++ b/tests/dot/t1.txt @@ -0,0 +1,11 @@ +[1 0 0, + 0 1 0, + 0 0 1] + +[1 0 0, + 0 1 0, + 0 0 1] + +[1 0 0, + 0 1 0, + 0 0 1] diff --git a/tests/scale/t1.txt b/tests/scale/t1.txt new file mode 100644 index 0000000..0a62489 --- /dev/null +++ b/tests/scale/t1.txt @@ -0,0 +1,9 @@ +[1 1 1, + 1 1 1, + 1 1 1] + +[2 2 2, + 2 2 2, + 2 2 2] + +[2] diff --git a/tests/test.c b/tests/test.c index 387c0b2..69d4047 100644 --- a/tests/test.c +++ b/tests/test.c @@ -9,218 +9,6 @@ //Print the matrix A with size m by n static void pmatrix(FILE *fp, double *A, int m, int n); -struct { - double A[9], // Left argument - B[9], // Right argument - C[9]; // Expected result -} dot_tests[] = { - { - .A = { - 1, 0, 0, - 0, 1, 0, - 0, 0, 1, - }, - .B = { - 1, 0, 0, - 0, 1, 0, - 0, 0, 1, - }, - .C = { - 1, 0, 0, - 0, 1, 0, - 0, 0, 1, - }, - }, -}; - -struct { - double A[9], // Input - B[9], // Expected output - factor; // Scale factor -} scale_tests[] = { - { - .A = { - 1, 1, 1, - 1, 1, 1, - 1, 1, 1, - }, - .B = { - 2, 2, 2, - 2, 2, 2, - 2, 2, 2, - }, - .factor = 2, - }, -}; - -struct { - double *A, *B; - int m, n; -} transp_tests[] = { - { - .A = (double[]) { - 1, 0, 0, 0, - 0, 2, 0, 0, - 0, 0, 3, 0, - 0, 0, 0, 4, - }, - .B = (double[]) { - 1, 0, 0, 0, - 0, 2, 0, 0, - 0, 0, 3, 0, - 0, 0, 0, 4, - }, - .m = 4, - .n = 4, - }, - { - .A = (double[]) { - 1, 2, 3, 4, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - }, - .B = (double[]) { - 1, 0, 0, 0, - 2, 0, 0, 0, - 3, 0, 0, 0, - 4, 0, 0, 0, - }, - .m = 4, - .n = 4, - }, - { - .A = (double[]) { - 0, 1, 0, 0, - 0, 2, 0, 0, - 0, 3, 0, 0, - 0, 4, 0, 0, - }, - .B = (double[]) { - 0, 0, 0, 0, - 1, 2, 3, 4, - 0, 0, 0, 0, - 0, 0, 0, 0, - }, - .m = 4, - .n = 4, - }, - { - .A = (double[]) { - 0, 0, 1, 0, - 0, 0, 2, 0, - 0, 0, 3, 0, - 0, 0, 4, 0, - }, - .B = (double[]) { - 0, 0, 0, 0, - 0, 0, 0, 0, - 1, 2, 3, 4, - 0, 0, 0, 0, - }, - .m = 4, - .n = 4, - }, - { - .A = (double[]) { - 0, 0, 0, 1, - 0, 0, 0, 2, - 0, 0, 0, 3, - 0, 0, 0, 4, - }, - .B = (double[]) { - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 1, 2, 3, 4, - }, - .m = 4, - .n = 4, - }, - { - .A = (double[]) { - 1, 0, 0, - 0, 2, 0, - 0, 0, 3, - }, - .B = (double[]) { - 1, 0, 0, - 0, 2, 0, - 0, 0, 3, - }, - .m = 3, - .n = 3, - }, - { - .A = (double[]) { - 1, 2, 3, - 0, 0, 0, - 0, 0, 0, - }, - .B = (double[]) { - 1, 0, 0, - 2, 0, 0, - 3, 0, 0, - }, - .m = 3, - .n = 3, - }, - { - .A = (double[]) { - 0, 1, 0, - 0, 2, 0, - 0, 3, 0, - }, - .B = (double[]) { - 0, 0, 0, - 1, 2, 3, - 0, 0, 0, - }, - .m = 3, - .n = 3, - }, - { - .A = (double[]) { - 0, 0, 1, - 0, 0, 2, - 0, 0, 3, - }, - .B = (double[]) { - 0, 0, 0, - 0, 0, 0, - 1, 2, 3, - }, - .m = 3, - .n = 3, - }, - { - .A = (double[]) { - 1, 2, 3, - 4, 5, 6, - }, - .B = (double[]) { - 1, 4, - 2, 5, - 3, 6, - }, - .m = 2, - .n = 3, - }, - { - .A = (double[]) { - 1, 4, - 2, 5, - 3, 6, - }, - .B = (double[]) { - 1, 2, 3, - 4, 5, 6, - }, - .m = 3, - .n = 2, - }, -}; - int main() { // Evaluate dot product tests. diff --git a/tests/test2.c b/tests/test_loader.c similarity index 100% rename from tests/test2.c rename to tests/test_loader.c diff --git a/tests/transpose/t1.txt b/tests/transpose/t1.txt new file mode 100644 index 0000000..9114f1e --- /dev/null +++ b/tests/transpose/t1.txt @@ -0,0 +1,9 @@ +[1 0 0 0, + 0 2 0 0, + 0 0 3 0, + 0 0 0 4] + +[1 0 0 0, + 0 2 0 0, + 0 0 3 0, + 0 0 0 4] diff --git a/tests/transpose/t10.txt b/tests/transpose/t10.txt new file mode 100644 index 0000000..7f85008 --- /dev/null +++ b/tests/transpose/t10.txt @@ -0,0 +1,6 @@ +[1 2, + 3 4, + 5 6] + +[1 3 5, + 2 4 6] diff --git a/tests/transpose/t2.txt b/tests/transpose/t2.txt new file mode 100644 index 0000000..f49dc36 --- /dev/null +++ b/tests/transpose/t2.txt @@ -0,0 +1,9 @@ +[1 2 3 4, + 0 0 0 0, + 0 0 0 0, + 0 0 0 0] + +[1 0 0 0, + 2 0 0 0, + 3 0 0 0, + 4 0 0 0] diff --git a/tests/transpose/t3.txt b/tests/transpose/t3.txt new file mode 100644 index 0000000..1257687 --- /dev/null +++ b/tests/transpose/t3.txt @@ -0,0 +1,9 @@ +[0 1 0 0, + 0 2 0 0, + 0 3 0 0, + 0 4 0 0] + +[0 0 0 0, + 1 2 3 4, + 0 0 0 0, + 0 0 0 0] diff --git a/tests/transpose/t4.txt b/tests/transpose/t4.txt new file mode 100644 index 0000000..9476301 --- /dev/null +++ b/tests/transpose/t4.txt @@ -0,0 +1,9 @@ +[0 0 1 0, + 0 0 2 0, + 0 0 3 0, + 0 0 4 0] + +[0 0 0 0, + 0 0 0 0, + 1 2 3 4, + 0 0 0 0] diff --git a/tests/transpose/t5.txt b/tests/transpose/t5.txt new file mode 100644 index 0000000..520a3b7 --- /dev/null +++ b/tests/transpose/t5.txt @@ -0,0 +1,9 @@ +[0 0 0 0, + 0 0 0 0, + 0 0 0 0, + 1 2 3 4] + +[0 0 0 1, + 0 0 0 2, + 0 0 0 3, + 0 0 0 4] diff --git a/tests/transpose/t6.txt b/tests/transpose/t6.txt new file mode 100644 index 0000000..bb70165 --- /dev/null +++ b/tests/transpose/t6.txt @@ -0,0 +1,7 @@ +[1 0 0, + 0 2 0, + 0 0 3] + +[1 0 0, + 0 2 0, + 0 0 3] diff --git a/tests/transpose/t7.txt b/tests/transpose/t7.txt new file mode 100644 index 0000000..3a6dfe6 --- /dev/null +++ b/tests/transpose/t7.txt @@ -0,0 +1,7 @@ +[1 2 3, + 0 0 0, + 0 0 0] + +[1 0 0, + 2 0 0, + 3 0 0] diff --git a/tests/transpose/t8.txt b/tests/transpose/t8.txt new file mode 100644 index 0000000..258f279 --- /dev/null +++ b/tests/transpose/t8.txt @@ -0,0 +1,7 @@ +[0 0 1, + 0 0 2, + 0 0 3] + +[0 0 0, + 0 0 0, + 1 2 3] diff --git a/tests/transpose/t9.txt b/tests/transpose/t9.txt new file mode 100644 index 0000000..929abcc --- /dev/null +++ b/tests/transpose/t9.txt @@ -0,0 +1,6 @@ +[1 2 3, + 4 5 6] + +[1 4, + 2 5, + 3 6]