diff --git a/tasks/orehov_n_jarvis_pass_seq/common/include/common.hpp b/tasks/orehov_n_jarvis_pass/common/include/common.hpp similarity index 88% rename from tasks/orehov_n_jarvis_pass_seq/common/include/common.hpp rename to tasks/orehov_n_jarvis_pass/common/include/common.hpp index 65693023b..988e447ca 100644 --- a/tasks/orehov_n_jarvis_pass_seq/common/include/common.hpp +++ b/tasks/orehov_n_jarvis_pass/common/include/common.hpp @@ -5,7 +5,7 @@ #include "task/include/task.hpp" -namespace orehov_n_jarvis_pass_seq { +namespace orehov_n_jarvis_pass { struct Point { double x; @@ -27,4 +27,4 @@ using OutType = std::vector; using TestType = int; using BaseTask = ppc::task::Task; -} // namespace orehov_n_jarvis_pass_seq +} // namespace orehov_n_jarvis_pass diff --git a/tasks/orehov_n_jarvis_pass_seq/info.json b/tasks/orehov_n_jarvis_pass/info.json similarity index 100% rename from tasks/orehov_n_jarvis_pass_seq/info.json rename to tasks/orehov_n_jarvis_pass/info.json diff --git a/tasks/orehov_n_jarvis_pass_seq/seq/include/ops_seq.hpp b/tasks/orehov_n_jarvis_pass/seq/include/ops_seq.hpp similarity index 83% rename from tasks/orehov_n_jarvis_pass_seq/seq/include/ops_seq.hpp rename to tasks/orehov_n_jarvis_pass/seq/include/ops_seq.hpp index f643c08e6..15c58e1ec 100644 --- a/tasks/orehov_n_jarvis_pass_seq/seq/include/ops_seq.hpp +++ b/tasks/orehov_n_jarvis_pass/seq/include/ops_seq.hpp @@ -2,10 +2,10 @@ #include -#include "orehov_n_jarvis_pass_seq/common/include/common.hpp" +#include "orehov_n_jarvis_pass/common/include/common.hpp" #include "task/include/task.hpp" -namespace orehov_n_jarvis_pass_seq { +namespace orehov_n_jarvis_pass { class OrehovNJarvisPassSEQ : public BaseTask { public: @@ -29,4 +29,4 @@ class OrehovNJarvisPassSEQ : public BaseTask { std::vector input_; }; -} // namespace orehov_n_jarvis_pass_seq +} // namespace orehov_n_jarvis_pass diff --git a/tasks/orehov_n_jarvis_pass_seq/seq/src/ops_seq.cpp b/tasks/orehov_n_jarvis_pass/seq/src/ops_seq.cpp similarity index 90% rename from tasks/orehov_n_jarvis_pass_seq/seq/src/ops_seq.cpp rename to tasks/orehov_n_jarvis_pass/seq/src/ops_seq.cpp index 91037dcc9..b1309b6e4 100644 --- a/tasks/orehov_n_jarvis_pass_seq/seq/src/ops_seq.cpp +++ b/tasks/orehov_n_jarvis_pass/seq/src/ops_seq.cpp @@ -1,12 +1,12 @@ -#include "orehov_n_jarvis_pass_seq/seq/include/ops_seq.hpp" +#include "orehov_n_jarvis_pass/seq/include/ops_seq.hpp" #include #include #include -#include "orehov_n_jarvis_pass_seq/common/include/common.hpp" +#include "orehov_n_jarvis_pass/common/include/common.hpp" -namespace orehov_n_jarvis_pass_seq { +namespace orehov_n_jarvis_pass { OrehovNJarvisPassSEQ::OrehovNJarvisPassSEQ(const InType &in) { SetTypeOfTask(GetStaticTypeOfTask()); @@ -88,4 +88,4 @@ bool OrehovNJarvisPassSEQ::PostProcessingImpl() { return true; } -} // namespace orehov_n_jarvis_pass_seq +} // namespace orehov_n_jarvis_pass diff --git a/tasks/orehov_n_jarvis_pass_seq/settings.json b/tasks/orehov_n_jarvis_pass/settings.json similarity index 100% rename from tasks/orehov_n_jarvis_pass_seq/settings.json rename to tasks/orehov_n_jarvis_pass/settings.json diff --git a/tasks/orehov_n_jarvis_pass_seq/tests/functional/main.cpp b/tasks/orehov_n_jarvis_pass/tests/functional/main.cpp similarity index 73% rename from tasks/orehov_n_jarvis_pass_seq/tests/functional/main.cpp rename to tasks/orehov_n_jarvis_pass/tests/functional/main.cpp index f235bb105..30cc298b8 100644 --- a/tasks/orehov_n_jarvis_pass_seq/tests/functional/main.cpp +++ b/tasks/orehov_n_jarvis_pass/tests/functional/main.cpp @@ -6,14 +6,14 @@ #include #include -#include "orehov_n_jarvis_pass_seq/common/include/common.hpp" -#include "orehov_n_jarvis_pass_seq/seq/include/ops_seq.hpp" +#include "orehov_n_jarvis_pass/common/include/common.hpp" +#include "orehov_n_jarvis_pass/seq/include/ops_seq.hpp" #include "util/include/func_test_util.hpp" #include "util/include/util.hpp" -namespace orehov_n_jarvis_pass_seq { +namespace orehov_n_jarvis_pass { -class OrehovNJarvisPassSEQFuncTests : public ppc::util::BaseRunFuncTests { +class OrehovNJarvisPassFuncTests : public ppc::util::BaseRunFuncTests { public: static std::string PrintTestParam(const TestType &test_param) { return std::to_string(test_param); @@ -63,21 +63,21 @@ class OrehovNJarvisPassSEQFuncTests : public ppc::util::BaseRunFuncTests kTestParam = {1, 2, 3}; const auto kTestTasksList = - std::tuple_cat(ppc::util::AddFuncTask(kTestParam, PPC_SETTINGS_example_threads)); + std::tuple_cat(ppc::util::AddFuncTask(kTestParam, PPC_SETTINGS_orehov_n_jarvis_pass)); const auto kGtestValues = ppc::util::ExpandToValues(kTestTasksList); -const auto kPerfTestName = OrehovNJarvisPassSEQFuncTests::PrintFuncTestName; +const auto kPerfTestName = OrehovNJarvisPassFuncTests::PrintFuncTestName; -INSTANTIATE_TEST_SUITE_P(PicMatrixTests, OrehovNJarvisPassSEQFuncTests, kGtestValues, kPerfTestName); +INSTANTIATE_TEST_SUITE_P(PicMatrixTests, OrehovNJarvisPassFuncTests, kGtestValues, kPerfTestName); } // namespace -} // namespace orehov_n_jarvis_pass_seq +} // namespace orehov_n_jarvis_pass diff --git a/tasks/orehov_n_jarvis_pass_seq/tests/performance/main.cpp b/tasks/orehov_n_jarvis_pass/tests/performance/main.cpp similarity index 57% rename from tasks/orehov_n_jarvis_pass_seq/tests/performance/main.cpp rename to tasks/orehov_n_jarvis_pass/tests/performance/main.cpp index dae7b7b63..e69eefb77 100644 --- a/tasks/orehov_n_jarvis_pass_seq/tests/performance/main.cpp +++ b/tasks/orehov_n_jarvis_pass/tests/performance/main.cpp @@ -2,13 +2,13 @@ #include -#include "orehov_n_jarvis_pass_seq/common/include/common.hpp" -#include "orehov_n_jarvis_pass_seq/seq/include/ops_seq.hpp" +#include "orehov_n_jarvis_pass/common/include/common.hpp" +#include "orehov_n_jarvis_pass/seq/include/ops_seq.hpp" #include "util/include/perf_test_util.hpp" -namespace orehov_n_jarvis_pass_seq { +namespace orehov_n_jarvis_pass { -class OrehovNJarvisPassSEQPerfTests : public ppc::util::BaseRunPerfTests { +class OrehovNJarvisPassPerfTests : public ppc::util::BaseRunPerfTests { const int kCount_ = 2000; InType input_data_; @@ -33,20 +33,20 @@ class OrehovNJarvisPassSEQPerfTests : public ppc::util::BaseRunPerfTests(PPC_SETTINGS_example_threads); +const auto kAllPerfTasks = ppc::util::MakeAllPerfTasks(PPC_SETTINGS_orehov_n_jarvis_pass); const auto kGtestValues = ppc::util::TupleToGTestValues(kAllPerfTasks); -const auto kPerfTestName = OrehovNJarvisPassSEQPerfTests::CustomPerfTestName; +const auto kPerfTestName = OrehovNJarvisPassPerfTests::CustomPerfTestName; -INSTANTIATE_TEST_SUITE_P(RunModeTests, OrehovNJarvisPassSEQPerfTests, kGtestValues, kPerfTestName); +INSTANTIATE_TEST_SUITE_P(RunModeTests, OrehovNJarvisPassPerfTests, kGtestValues, kPerfTestName); } // namespace -} // namespace orehov_n_jarvis_pass_seq +} // namespace orehov_n_jarvis_pass