diff --git a/tasks/omp/belan_vadim_mat_fox_omp/func_tests/main.cpp b/tasks/omp/belan_vadim_mat_fox_omp/func_tests/main.cpp index d5bd69a47..58eed4bf3 100644 --- a/tasks/omp/belan_vadim_mat_fox_omp/func_tests/main.cpp +++ b/tasks/omp/belan_vadim_mat_fox_omp/func_tests/main.cpp @@ -2,11 +2,11 @@ #include -#include "omp/belan_vadim_mat_fox_omp/include/ops_omp.hpp" +#include "tbb/belan_vadim_mat_fox_tbb/include/ops_tbb.hpp" -using namespace BelanOMP; +using namespace BelanTBB; -TEST(FoxBlockedParallel, MatrixMultiplication2x2) { +TEST(BelanFoxBlockedParallelOMP, MatrixMultiplication2x2) { // Define input matrices std::vector matrixA = {1, 2, 3, 4}; std::vector matrixB = {4, 3, 2, 1}; @@ -41,7 +41,7 @@ TEST(FoxBlockedParallel, MatrixMultiplication2x2) { delete[] output; } -TEST(FoxBlockedParallel, MatrixMultiplication) { +TEST(BelanFoxBlockedParallelOMP, MatrixMultiplication) { // Define input matrices std::vector matrixA = {1, 2, 3, 4, 5, 6, 7, 8, 9}; std::vector matrixB = {9, 8, 7, 6, 5, 4, 3, 2, 1}; @@ -76,7 +76,7 @@ TEST(FoxBlockedParallel, MatrixMultiplication) { delete[] output; } -TEST(FoxBlockedParallel, MatrixMultiplication_VerySmallMatrices) { +TEST(BelanFoxBlockedParallelOMP, MatrixMultiplication_VerySmallMatrices) { // Define input matrices std::vector matrixA(10 * 10); std::vector matrixB(10 * 10); @@ -126,7 +126,7 @@ TEST(FoxBlockedParallel, MatrixMultiplication_VerySmallMatrices) { delete[] output; } -TEST(FoxBlockedParallel, MatrixMultiplication_SmallMatrices) { +TEST(BelanFoxBlockedParallelOMP, MatrixMultiplication_SmallMatrices) { // Define input matrices std::vector matrixA(100 * 100); std::vector matrixB(100 * 100); @@ -176,7 +176,7 @@ TEST(FoxBlockedParallel, MatrixMultiplication_SmallMatrices) { delete[] output; } -TEST(FoxBlockedParallel, MatrixMultiplicationWithNegatives) { +TEST(BelanFoxBlockedParallelOMP, MatrixMultiplicationWithNegatives) { // Define input matrices with negative values std::vector matrixA = {-1, -2, -3, -4, -5, -6, -7, -8, -9}; std::vector matrixB = {-9, -8, -7, -6, -5, -4, -3, -2, -1}; diff --git a/tasks/stl/belan_vadim_mat_fox_stl/func_tests/main.cpp b/tasks/stl/belan_vadim_mat_fox_stl/func_tests/main.cpp index 3c2685451..6b2e980c2 100644 --- a/tasks/stl/belan_vadim_mat_fox_stl/func_tests/main.cpp +++ b/tasks/stl/belan_vadim_mat_fox_stl/func_tests/main.cpp @@ -6,7 +6,7 @@ using namespace BelanSTL; -TEST(FoxBlockedParallel, MatrixMultiplication2x2) { +TEST(BelanFoxBlockedParallelSTL, MatrixMultiplication2x2) { // Define input matrices std::vector matrixA = {1, 2, 3, 4}; std::vector matrixB = {4, 3, 2, 1}; @@ -41,7 +41,7 @@ TEST(FoxBlockedParallel, MatrixMultiplication2x2) { delete[] output; } -TEST(FoxBlockedParallel, MatrixMultiplication) { +TEST(BelanFoxBlockedParallelSTL, MatrixMultiplication) { // Define input matrices std::vector matrixA = {1, 2, 3, 4, 5, 6, 7, 8, 9}; std::vector matrixB = {9, 8, 7, 6, 5, 4, 3, 2, 1}; @@ -76,7 +76,7 @@ TEST(FoxBlockedParallel, MatrixMultiplication) { delete[] output; } -TEST(FoxBlockedParallel, MatrixMultiplication_VerySmallMatrices) { +TEST(BelanFoxBlockedParallelSTL, MatrixMultiplication_VerySmallMatrices) { // Define input matrices std::vector matrixA(10 * 10); std::vector matrixB(10 * 10); @@ -126,7 +126,7 @@ TEST(FoxBlockedParallel, MatrixMultiplication_VerySmallMatrices) { delete[] output; } -TEST(FoxBlockedParallel, MatrixMultiplication_SmallMatrices) { +TEST(BelanFoxBlockedParallelSTL, MatrixMultiplication_SmallMatrices) { // Define input matrices std::vector matrixA(100 * 100); std::vector matrixB(100 * 100); @@ -176,7 +176,7 @@ TEST(FoxBlockedParallel, MatrixMultiplication_SmallMatrices) { delete[] output; } -TEST(FoxBlockedParallel, MatrixMultiplicationWithNegatives) { +TEST(BelanFoxBlockedParallelSTL, MatrixMultiplicationWithNegatives) { // Define input matrices with negative values std::vector matrixA = {-1, -2, -3, -4, -5, -6, -7, -8, -9}; std::vector matrixB = {-9, -8, -7, -6, -5, -4, -3, -2, -1}; diff --git a/tasks/tbb/belan_vadim_mat_fox_tbb/func_tests/main.cpp b/tasks/tbb/belan_vadim_mat_fox_tbb/func_tests/main.cpp index 2adc381fa..f0b42032b 100644 --- a/tasks/tbb/belan_vadim_mat_fox_tbb/func_tests/main.cpp +++ b/tasks/tbb/belan_vadim_mat_fox_tbb/func_tests/main.cpp @@ -6,7 +6,7 @@ using namespace BelanTBB; -TEST(FoxBlockedParallel, MatrixMultiplication2x2) { +TEST(BelanFoxBlockedParallelTBB, MatrixMultiplication2x2) { // Define input matrices std::vector matrixA = {1, 2, 3, 4}; std::vector matrixB = {4, 3, 2, 1}; @@ -41,7 +41,7 @@ TEST(FoxBlockedParallel, MatrixMultiplication2x2) { delete[] output; } -TEST(FoxBlockedParallel, MatrixMultiplication) { +TEST(BelanFoxBlockedParallelTBB, MatrixMultiplication) { // Define input matrices std::vector matrixA = {1, 2, 3, 4, 5, 6, 7, 8, 9}; std::vector matrixB = {9, 8, 7, 6, 5, 4, 3, 2, 1}; @@ -76,7 +76,7 @@ TEST(FoxBlockedParallel, MatrixMultiplication) { delete[] output; } -TEST(FoxBlockedParallel, MatrixMultiplication_VerySmallMatrices) { +TEST(BelanFoxBlockedParallelTBB, MatrixMultiplication_VerySmallMatrices) { // Define input matrices std::vector matrixA(10 * 10); std::vector matrixB(10 * 10); @@ -126,7 +126,7 @@ TEST(FoxBlockedParallel, MatrixMultiplication_VerySmallMatrices) { delete[] output; } -TEST(FoxBlockedParallel, MatrixMultiplication_SmallMatrices) { +TEST(BelanFoxBlockedParallelTBB, MatrixMultiplication_SmallMatrices) { // Define input matrices std::vector matrixA(100 * 100); std::vector matrixB(100 * 100); @@ -176,7 +176,7 @@ TEST(FoxBlockedParallel, MatrixMultiplication_SmallMatrices) { delete[] output; } -TEST(FoxBlockedParallel, MatrixMultiplicationWithNegatives) { +TEST(BelanFoxBlockedParallelTBB, MatrixMultiplicationWithNegatives) { // Define input matrices with negative values std::vector matrixA = {-1, -2, -3, -4, -5, -6, -7, -8, -9}; std::vector matrixB = {-9, -8, -7, -6, -5, -4, -3, -2, -1};