Skip to content

[FIX]Кичанова Ксения. Технология SEQ. Решение систем линейных уравнений методом сопряженных градиентов. Вариант 8 #1355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KsenkaKich wants to merge 2 commits into
base: master
Choose a base branch
from
+3 −42
Open

[FIX]Кичанова Ксения. Технология SEQ. Решение систем линейных уравнений методом сопряженных градиентов. Вариант 8 #1355

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94d68db
add fix
KsenkaKich May 19, 2026
6a7de07
after tests_1
KsenkaKich May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 3 additions & 42 deletions tasks/kichanova_k_lin_system_by_conjug_grad/tests/functional/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#include <array>
#include <cmath>
#include <cstddef>
#include <random>
#include <string>
#include <tuple>
#include <vector>
Expand Down Expand Up @@ -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<double> 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<size_t>(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<size_t>(i) * stride) + k] * m[(static_cast<size_t>(j) * stride) + k];
}
data.A[(static_cast<size_t>(i) * stride) + j] = sum + n;
}
}

data.b.resize(static_cast<size_t>(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<size_t>(n) * n;

Expand All @@ -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
Expand Down Expand Up @@ -170,11 +132,10 @@ TEST_P(KichanovaKRunFuncTestsThreads, SolveLinearSystem) {
ExecuteTest(GetParam());
}

const std::array<TestType, 12> kTestParam = {
const std::array<TestType, 9> 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<KichanovaKLinSystemByConjugGradSEQ, LinSystemData>(
kTestParam, PPC_SETTINGS_kichanova_k_lin_system_by_conjug_grad),
Expand Down
Loading