diff --git a/tasks/luzan_e_double_sparse_matrix_mult_seq/common/include/common.hpp b/tasks/luzan_e_double_sparse_matrix_mult/common/include/common.hpp similarity index 97% rename from tasks/luzan_e_double_sparse_matrix_mult_seq/common/include/common.hpp rename to tasks/luzan_e_double_sparse_matrix_mult/common/include/common.hpp index 72d63eb51..ef14aff15 100644 --- a/tasks/luzan_e_double_sparse_matrix_mult_seq/common/include/common.hpp +++ b/tasks/luzan_e_double_sparse_matrix_mult/common/include/common.hpp @@ -10,7 +10,7 @@ #include "task/include/task.hpp" -namespace luzan_e_double_sparse_matrix_mult_seq { +namespace luzan_e_double_sparse_matrix_mult { const double kEPS = 1e-8; @@ -116,7 +116,7 @@ class SparseMatrix { return rows_; } - std::vector GetVal() { + [[nodiscard]] std::vector GetVal() { return value_; } @@ -244,4 +244,4 @@ using OutType = SparseMatrix; using TestType = std::tuple; using BaseTask = ppc::task::Task; -} // namespace luzan_e_double_sparse_matrix_mult_seq +} // namespace luzan_e_double_sparse_matrix_mult diff --git a/tasks/luzan_e_double_sparse_matrix_mult_seq/data/ans_test_1.txt b/tasks/luzan_e_double_sparse_matrix_mult/data/ans_test_1.txt similarity index 100% rename from tasks/luzan_e_double_sparse_matrix_mult_seq/data/ans_test_1.txt rename to tasks/luzan_e_double_sparse_matrix_mult/data/ans_test_1.txt diff --git a/tasks/luzan_e_double_sparse_matrix_mult_seq/data/ans_test_2.txt b/tasks/luzan_e_double_sparse_matrix_mult/data/ans_test_2.txt similarity index 100% rename from tasks/luzan_e_double_sparse_matrix_mult_seq/data/ans_test_2.txt rename to tasks/luzan_e_double_sparse_matrix_mult/data/ans_test_2.txt diff --git a/tasks/luzan_e_double_sparse_matrix_mult_seq/data/ans_test_3.txt b/tasks/luzan_e_double_sparse_matrix_mult/data/ans_test_3.txt similarity index 100% rename from tasks/luzan_e_double_sparse_matrix_mult_seq/data/ans_test_3.txt rename to tasks/luzan_e_double_sparse_matrix_mult/data/ans_test_3.txt diff --git a/tasks/luzan_e_double_sparse_matrix_mult_seq/data/ans_test_4.txt b/tasks/luzan_e_double_sparse_matrix_mult/data/ans_test_4.txt similarity index 100% rename from tasks/luzan_e_double_sparse_matrix_mult_seq/data/ans_test_4.txt rename to tasks/luzan_e_double_sparse_matrix_mult/data/ans_test_4.txt diff --git a/tasks/luzan_e_double_sparse_matrix_mult_seq/data/ans_test_5.txt b/tasks/luzan_e_double_sparse_matrix_mult/data/ans_test_5.txt similarity index 100% rename from tasks/luzan_e_double_sparse_matrix_mult_seq/data/ans_test_5.txt rename to tasks/luzan_e_double_sparse_matrix_mult/data/ans_test_5.txt diff --git a/tasks/luzan_e_double_sparse_matrix_mult_seq/data/ans_test_6.txt b/tasks/luzan_e_double_sparse_matrix_mult/data/ans_test_6.txt similarity index 100% rename from tasks/luzan_e_double_sparse_matrix_mult_seq/data/ans_test_6.txt rename to tasks/luzan_e_double_sparse_matrix_mult/data/ans_test_6.txt diff --git a/tasks/luzan_e_double_sparse_matrix_mult_seq/data/test_1.txt b/tasks/luzan_e_double_sparse_matrix_mult/data/test_1.txt similarity index 100% rename from tasks/luzan_e_double_sparse_matrix_mult_seq/data/test_1.txt rename to tasks/luzan_e_double_sparse_matrix_mult/data/test_1.txt diff --git a/tasks/luzan_e_double_sparse_matrix_mult_seq/data/test_2.txt b/tasks/luzan_e_double_sparse_matrix_mult/data/test_2.txt similarity index 100% rename from tasks/luzan_e_double_sparse_matrix_mult_seq/data/test_2.txt rename to tasks/luzan_e_double_sparse_matrix_mult/data/test_2.txt diff --git a/tasks/luzan_e_double_sparse_matrix_mult_seq/data/test_3.txt b/tasks/luzan_e_double_sparse_matrix_mult/data/test_3.txt similarity index 100% rename from tasks/luzan_e_double_sparse_matrix_mult_seq/data/test_3.txt rename to tasks/luzan_e_double_sparse_matrix_mult/data/test_3.txt diff --git a/tasks/luzan_e_double_sparse_matrix_mult_seq/data/test_4.txt b/tasks/luzan_e_double_sparse_matrix_mult/data/test_4.txt similarity index 100% rename from tasks/luzan_e_double_sparse_matrix_mult_seq/data/test_4.txt rename to tasks/luzan_e_double_sparse_matrix_mult/data/test_4.txt diff --git a/tasks/luzan_e_double_sparse_matrix_mult_seq/data/test_5.txt b/tasks/luzan_e_double_sparse_matrix_mult/data/test_5.txt similarity index 100% rename from tasks/luzan_e_double_sparse_matrix_mult_seq/data/test_5.txt rename to tasks/luzan_e_double_sparse_matrix_mult/data/test_5.txt diff --git a/tasks/luzan_e_double_sparse_matrix_mult_seq/data/test_6.txt b/tasks/luzan_e_double_sparse_matrix_mult/data/test_6.txt similarity index 100% rename from tasks/luzan_e_double_sparse_matrix_mult_seq/data/test_6.txt rename to tasks/luzan_e_double_sparse_matrix_mult/data/test_6.txt diff --git a/tasks/luzan_e_double_sparse_matrix_mult_seq/info.json b/tasks/luzan_e_double_sparse_matrix_mult/info.json similarity index 100% rename from tasks/luzan_e_double_sparse_matrix_mult_seq/info.json rename to tasks/luzan_e_double_sparse_matrix_mult/info.json diff --git a/tasks/luzan_e_double_sparse_matrix_mult_seq/seq/include/ops_seq.hpp b/tasks/luzan_e_double_sparse_matrix_mult/seq/include/ops_seq.hpp similarity index 70% rename from tasks/luzan_e_double_sparse_matrix_mult_seq/seq/include/ops_seq.hpp rename to tasks/luzan_e_double_sparse_matrix_mult/seq/include/ops_seq.hpp index d930b32da..f58a00789 100644 --- a/tasks/luzan_e_double_sparse_matrix_mult_seq/seq/include/ops_seq.hpp +++ b/tasks/luzan_e_double_sparse_matrix_mult/seq/include/ops_seq.hpp @@ -1,9 +1,9 @@ #pragma once -#include "luzan_e_double_sparse_matrix_mult_seq/common/include/common.hpp" +#include "luzan_e_double_sparse_matrix_mult/common/include/common.hpp" #include "task/include/task.hpp" -namespace luzan_e_double_sparse_matrix_mult_seq { +namespace luzan_e_double_sparse_matrix_mult { class LuzanEDoubleSparseMatrixMultSeq : public BaseTask { public: @@ -19,4 +19,4 @@ class LuzanEDoubleSparseMatrixMultSeq : public BaseTask { bool PostProcessingImpl() override; }; -} // namespace luzan_e_double_sparse_matrix_mult_seq +} // namespace luzan_e_double_sparse_matrix_mult diff --git a/tasks/luzan_e_double_sparse_matrix_mult_seq/seq/src/ops_seq.cpp b/tasks/luzan_e_double_sparse_matrix_mult/seq/src/ops_seq.cpp similarity index 75% rename from tasks/luzan_e_double_sparse_matrix_mult_seq/seq/src/ops_seq.cpp rename to tasks/luzan_e_double_sparse_matrix_mult/seq/src/ops_seq.cpp index 6dc7a5e79..4a947e36c 100644 --- a/tasks/luzan_e_double_sparse_matrix_mult_seq/seq/src/ops_seq.cpp +++ b/tasks/luzan_e_double_sparse_matrix_mult/seq/src/ops_seq.cpp @@ -1,9 +1,9 @@ -#include "luzan_e_double_sparse_matrix_mult_seq/seq/include/ops_seq.hpp" +#include "luzan_e_double_sparse_matrix_mult/seq/include/ops_seq.hpp" -#include "luzan_e_double_sparse_matrix_mult_seq/common/include/common.hpp" +#include "luzan_e_double_sparse_matrix_mult/common/include/common.hpp" // #include "util/include/util.hpp" -namespace luzan_e_double_sparse_matrix_mult_seq { +namespace luzan_e_double_sparse_matrix_mult { LuzanEDoubleSparseMatrixMultSeq::LuzanEDoubleSparseMatrixMultSeq(const InType &in) { SetTypeOfTask(GetStaticTypeOfTask()); @@ -33,4 +33,4 @@ bool LuzanEDoubleSparseMatrixMultSeq::PostProcessingImpl() { return true; } -} // namespace luzan_e_double_sparse_matrix_mult_seq +} // namespace luzan_e_double_sparse_matrix_mult diff --git a/tasks/luzan_e_double_sparse_matrix_mult_seq/settings.json b/tasks/luzan_e_double_sparse_matrix_mult/settings.json similarity index 100% rename from tasks/luzan_e_double_sparse_matrix_mult_seq/settings.json rename to tasks/luzan_e_double_sparse_matrix_mult/settings.json diff --git a/tasks/luzan_e_double_sparse_matrix_mult_seq/tests/functional/main.cpp b/tasks/luzan_e_double_sparse_matrix_mult/tests/functional/main.cpp similarity index 85% rename from tasks/luzan_e_double_sparse_matrix_mult_seq/tests/functional/main.cpp rename to tasks/luzan_e_double_sparse_matrix_mult/tests/functional/main.cpp index c252af9c7..7c0651af8 100644 --- a/tasks/luzan_e_double_sparse_matrix_mult_seq/tests/functional/main.cpp +++ b/tasks/luzan_e_double_sparse_matrix_mult/tests/functional/main.cpp @@ -8,12 +8,12 @@ #include #include -#include "luzan_e_double_sparse_matrix_mult_seq/common/include/common.hpp" -#include "luzan_e_double_sparse_matrix_mult_seq/seq/include/ops_seq.hpp" +#include "luzan_e_double_sparse_matrix_mult/common/include/common.hpp" +#include "luzan_e_double_sparse_matrix_mult/seq/include/ops_seq.hpp" #include "util/include/func_test_util.hpp" #include "util/include/util.hpp" -namespace luzan_e_double_sparse_matrix_mult_seq { +namespace luzan_e_double_sparse_matrix_mult { class LuzanEDoubleSparseMatrixMultSeqestsThreads : public ppc::util::BaseRunFuncTests { public: @@ -26,7 +26,7 @@ class LuzanEDoubleSparseMatrixMultSeqestsThreads : public ppc::util::BaseRunFunc TestType params = std::get(ppc::util::GTestParamIndex::kTestParams)>(GetParam()); std::string file_name = std::get<0>(params); std::string abs_path = - ppc::util::GetAbsoluteTaskPath(std::string(PPC_ID_luzan_e_double_sparse_matrix_mult_seq), file_name); + ppc::util::GetAbsoluteTaskPath(std::string(PPC_ID_luzan_e_double_sparse_matrix_mult), file_name); std::ifstream test_file(abs_path); if (!test_file) { throw std::runtime_error("Cannot open task file"); @@ -39,7 +39,7 @@ class LuzanEDoubleSparseMatrixMultSeqestsThreads : public ppc::util::BaseRunFunc input_data_ = std::make_tuple(a, b); file_name = "ans_" + std::get<0>(params); - abs_path = ppc::util::GetAbsoluteTaskPath(std::string(PPC_ID_luzan_e_double_sparse_matrix_mult_seq), file_name); + abs_path = ppc::util::GetAbsoluteTaskPath(std::string(PPC_ID_luzan_e_double_sparse_matrix_mult), file_name); std::ifstream ans_file(abs_path); if (!ans_file) { throw std::runtime_error("Cannot open asn file"); @@ -72,7 +72,7 @@ const std::array kTestParam = {std::make_tuple("test_1.txt", "01"), std::make_tuple("test_5.txt", "05"), std::make_tuple("test_6.txt", "06")}; const auto kTestTasksList = std::tuple_cat(ppc::util::AddFuncTask( - kTestParam, PPC_SETTINGS_luzan_e_double_sparse_matrix_mult_seq)); + kTestParam, PPC_SETTINGS_luzan_e_double_sparse_matrix_mult)); const auto kGtestValues = ppc::util::ExpandToValues(kTestTasksList); @@ -83,4 +83,4 @@ INSTANTIATE_TEST_SUITE_P(FuncTests, LuzanEDoubleSparseMatrixMultSeqestsThreads, } // namespace -} // namespace luzan_e_double_sparse_matrix_mult_seq +} // namespace luzan_e_double_sparse_matrix_mult diff --git a/tasks/luzan_e_double_sparse_matrix_mult_seq/tests/performance/main.cpp b/tasks/luzan_e_double_sparse_matrix_mult/tests/performance/main.cpp similarity index 81% rename from tasks/luzan_e_double_sparse_matrix_mult_seq/tests/performance/main.cpp rename to tasks/luzan_e_double_sparse_matrix_mult/tests/performance/main.cpp index d129dd3a1..801568ac5 100644 --- a/tasks/luzan_e_double_sparse_matrix_mult_seq/tests/performance/main.cpp +++ b/tasks/luzan_e_double_sparse_matrix_mult/tests/performance/main.cpp @@ -3,11 +3,11 @@ #include #include -#include "luzan_e_double_sparse_matrix_mult_seq/common/include/common.hpp" -#include "luzan_e_double_sparse_matrix_mult_seq/seq/include/ops_seq.hpp" +#include "luzan_e_double_sparse_matrix_mult/common/include/common.hpp" +#include "luzan_e_double_sparse_matrix_mult/seq/include/ops_seq.hpp" #include "util/include/perf_test_util.hpp" -namespace luzan_e_double_sparse_matrix_mult_seq { +namespace luzan_e_double_sparse_matrix_mult { class LuzanEDoubleSparseMatrixMultSeqPerfTestThreads : public ppc::util::BaseRunPerfTests { const int kCount_ = 2500; @@ -46,7 +46,7 @@ TEST_P(LuzanEDoubleSparseMatrixMultSeqPerfTestThreads, RunPerfModes) { namespace { const auto kAllPerfTasks = ppc::util::MakeAllPerfTasks( - PPC_SETTINGS_luzan_e_double_sparse_matrix_mult_seq); + PPC_SETTINGS_luzan_e_double_sparse_matrix_mult); const auto kGtestValues = ppc::util::TupleToGTestValues(kAllPerfTasks); @@ -56,4 +56,4 @@ INSTANTIATE_TEST_SUITE_P(RunModeTests, LuzanEDoubleSparseMatrixMultSeqPerfTestTh } // namespace -} // namespace luzan_e_double_sparse_matrix_mult_seq +} // namespace luzan_e_double_sparse_matrix_mult