diff --git a/tasks/kichanova_k_lin_system_by_conjug_grad/tests/functional/main.cpp b/tasks/kichanova_k_lin_system_by_conjug_grad/tests/functional/main.cpp index 418bb233d9..55980cc261 100644 --- a/tasks/kichanova_k_lin_system_by_conjug_grad/tests/functional/main.cpp +++ b/tasks/kichanova_k_lin_system_by_conjug_grad/tests/functional/main.cpp @@ -3,7 +3,6 @@ #include #include #include -#include #include #include #include @@ -69,40 +68,6 @@ LinSystemData CreateTridiagonalSystem(int n, size_t n_squared) { return data; } -LinSystemData CreateRandomSPDSystem(int n, size_t n_squared) { - std::random_device rd; - std::mt19937 gen(rd()); - std::uniform_real_distribution<> dis(-1.0, 1.0); - - LinSystemData data; - data.n = n; - data.epsilon = 1e-10; - - std::vector m(n_squared); - for (int i = 0; i < n * n; ++i) { - m[i] = dis(gen); - } - - data.A.assign(n_squared, 0.0); - const auto stride = static_cast(n); - for (int i = 0; i < n; ++i) { - for (int j = 0; j < n; ++j) { - double sum = 0.0; - for (int k = 0; k < n; ++k) { - sum += m[(static_cast(i) * stride) + k] * m[(static_cast(j) * stride) + k]; - } - data.A[(static_cast(i) * stride) + j] = sum + n; - } - } - - data.b.resize(static_cast(n)); - for (int i = 0; i < n; ++i) { - data.b[i] = dis(gen); - } - - return data; -} - LinSystemData CreateTestSystem(int n, const std::string &type) { const size_t n_squared = static_cast(n) * n; @@ -112,10 +77,7 @@ LinSystemData CreateTestSystem(int n, const std::string &type) { if (type == "diagonal") { return CreateDiagonalSystem(n, n_squared); } - if (type == "tridiagonal") { - return CreateTridiagonalSystem(n, n_squared); - } - return CreateRandomSPDSystem(n, n_squared); + return CreateTridiagonalSystem(n, n_squared); } } // namespace @@ -170,11 +132,10 @@ TEST_P(KichanovaKRunFuncTestsThreads, SolveLinearSystem) { ExecuteTest(GetParam()); } -const std::array kTestParam = { +const std::array kTestParam = { std::make_tuple(2, "identity"), std::make_tuple(3, "identity"), std::make_tuple(5, "identity"), std::make_tuple(2, "diagonal"), std::make_tuple(4, "diagonal"), std::make_tuple(6, "diagonal"), - std::make_tuple(3, "tridiagonal"), std::make_tuple(5, "tridiagonal"), std::make_tuple(7, "tridiagonal"), - std::make_tuple(4, "random_spd"), std::make_tuple(8, "random_spd"), std::make_tuple(10, "random_spd")}; + std::make_tuple(3, "tridiagonal"), std::make_tuple(5, "tridiagonal"), std::make_tuple(7, "tridiagonal")}; const auto kTestTasksList = std::tuple_cat(ppc::util::AddFuncTask( kTestParam, PPC_SETTINGS_kichanova_k_lin_system_by_conjug_grad),