marov: task 1 - count letters (MPI + SEQ)

Author: Marofal

tasks/marov_count_letters/mpi/include/ops_mpi.hpp

@@ -5,12 +5,12 @@
 
 namespace marov_count_letters {
 
-class MarovCountLettersMPI : public BaseTask {
+class MarovCountLettersMpi : public BaseTask {
  public:
   static constexpr ppc::task::TypeOfTask GetStaticTypeOfTask() {
     return ppc::task::TypeOfTask::kMPI;
   }
-  explicit MarovCountLettersMPI(const InType &in);
+  explicit MarovCountLettersMpi(const InType& in);
 
  private:
   int proc_rank_{0};

tasks/marov_count_letters/mpi/src/ops_mpi.cpp

@@ -10,7 +10,7 @@
 
 namespace marov_count_letters {
 
-MarovCountLettersMPI::MarovCountLettersMPI(const InType &in) {
+MarovCountLettersMpi::MarovCountLettersMpi(const InType& in) {
   MPI_Comm_rank(MPI_COMM_WORLD, &proc_rank_);
   MPI_Comm_size(MPI_COMM_WORLD, &proc_size_);
 
@@ -19,15 +19,15 @@ MarovCountLettersMPI::MarovCountLettersMPI(const InType &in) {
   GetOutput() = 0;
 }
 
-bool MarovCountLettersMPI::ValidationImpl() {
+bool MarovCountLettersMpi::ValidationImpl() {
   return true;
 }
 
-bool MarovCountLettersMPI::PreProcessingImpl() {
+bool MarovCountLettersMpi::PreProcessingImpl() {
   return true;
 }
 
-bool MarovCountLettersMPI::RunImpl() {
+bool MarovCountLettersMpi::RunImpl() {
   std::string input_str;
   int str_len = 0;
 
@@ -36,10 +36,10 @@ bool MarovCountLettersMPI::RunImpl() {
     str_len = static_cast<int>(input_str.size());
   }
 
-  // Рассылка длины строки всем процессам
+  // Broadcast string length
   MPI_Bcast(&str_len, 1, MPI_INT, 0, MPI_COMM_WORLD);
 
-  // Разделение данных между процессами
+  // Split data between processes
   const int base = str_len / proc_size_;
   const int rem = str_len % proc_size_;
 
@@ -61,21 +61,22 @@ bool MarovCountLettersMPI::RunImpl() {
   const int local_size = base + (proc_rank_ < rem ? 1 : 0);
   std::vector<char> local_data(local_size);
 
-  MPI_Scatterv(proc_rank_ == 0 ? const_cast<char *>(input_str.data()) : nullptr,
+  MPI_Scatterv(proc_rank_ == 0 ? const_cast<char*>(input_str.data()) : nullptr,
                send_counts.data(), displs.data(), MPI_CHAR,
                local_data.data(), local_size, MPI_CHAR, 0, MPI_COMM_WORLD);
 
-  // Подсчет буквенных символов локально
+  // Count letter characters locally
   int local_count = 0;
   for (int i = 0; i < local_size; ++i) {
-    if (std::isalpha(static_cast<unsigned char>(local_data[i]))) {
+    if (std::isalpha(static_cast<unsigned char>(local_data[i])) != 0) {
       local_count++;
     }
   }
 
-  // Редукция - сумма всех локальных подсчетов
+  // Reduction - sum of all local counts
   int global_count = 0;
-  MPI_Reduce(&local_count, &global_count, 1, MPI_INT, MPI_SUM, 0, MPI_COMM_WORLD);
+  MPI_Reduce(&local_count, &global_count, 1, MPI_INT, MPI_SUM, 0,
+             MPI_COMM_WORLD);
 
   if (proc_rank_ == 0) {
     GetOutput() = global_count;
@@ -84,7 +85,7 @@ bool MarovCountLettersMPI::RunImpl() {
   return true;
 }
 
-bool MarovCountLettersMPI::PostProcessingImpl() {
+bool MarovCountLettersMpi::PostProcessingImpl() {
   return true;
 }
 

tasks/marov_count_letters/seq/include/ops_seq.hpp

@@ -5,12 +5,12 @@
 
 namespace marov_count_letters {
 
-class MarovCountLettersSEQ : public BaseTask {
+class MarovCountLettersSeq : public BaseTask {
  public:
   static constexpr ppc::task::TypeOfTask GetStaticTypeOfTask() {
     return ppc::task::TypeOfTask::kSEQ;
   }
-  explicit MarovCountLettersSEQ(const InType &in);
+  explicit MarovCountLettersSeq(const InType& in);
 
  private:
   bool ValidationImpl() override;

tasks/marov_count_letters/seq/src/ops_seq.cpp

@@ -7,26 +7,26 @@
 
 namespace marov_count_letters {
 
-MarovCountLettersSEQ::MarovCountLettersSEQ(const InType &in) {
+MarovCountLettersSeq::MarovCountLettersSeq(const InType& in) {
   SetTypeOfTask(GetStaticTypeOfTask());
   GetInput() = in;
   GetOutput() = 0;
 }
 
-bool MarovCountLettersSEQ::ValidationImpl() {
+bool MarovCountLettersSeq::ValidationImpl() {
   return true;
 }
 
-bool MarovCountLettersSEQ::PreProcessingImpl() {
+bool MarovCountLettersSeq::PreProcessingImpl() {
   return true;
 }
 
-bool MarovCountLettersSEQ::RunImpl() {
-  const std::string &input_str = GetInput();
+bool MarovCountLettersSeq::RunImpl() {
+  const std::string& input_str = GetInput();
   int count = 0;
 
   for (char c : input_str) {
-    if (std::isalpha(static_cast<unsigned char>(c))) {
+    if (std::isalpha(static_cast<unsigned char>(c)) != 0) {
       count++;
     }
   }
@@ -35,7 +35,7 @@ bool MarovCountLettersSEQ::RunImpl() {
   return true;
 }
 
-bool MarovCountLettersSEQ::PostProcessingImpl() {
+bool MarovCountLettersSeq::PostProcessingImpl() {
   return true;
 }
 

tasks/marov_count_letters/tests/functional/main.cpp

@@ -1,21 +1,20 @@
 #include <gtest/gtest.h>
-
-#include <algorithm>
+#include <array>
 #include <string>
 #include <tuple>
-#include <vector>
 
 #include "marov_count_letters/common/include/common.hpp"
 #include "marov_count_letters/mpi/include/ops_mpi.hpp"
 #include "marov_count_letters/seq/include/ops_seq.hpp"
 #include "util/include/func_test_util.hpp"
-#include "util/include/util.hpp"
 
 namespace marov_count_letters {
 
-class MarovCountLettersFuncTests : public ppc::util::BaseRunFuncTests<InType, OutType, TestType> {
+class MarovCountLettersFuncTests
+    : public ppc::util::BaseRunFuncTests<InType, OutType, TestType> {
  public:
-  static std::string PrintTestParam(const testing::TestParamInfo<ParamType>& info) {
+  static std::string PrintTestParam(
+      const testing::TestParamInfo<ParamType>& info) {
     return "test_" + std::to_string(info.index);
   }
 
@@ -56,13 +55,16 @@ const std::array kTestCases = {
     std::make_tuple(std::string("aBcDeFgHiJkLmNoPqRsTuVwXyZ"), 26),
 };
 
-const auto kAllTestTasks = std::tuple_cat(
-    ppc::util::AddFuncTask<MarovCountLettersMPI, InType>(kTestCases, PPC_SETTINGS_marov_count_letters),
-    ppc::util::AddFuncTask<MarovCountLettersSEQ, InType>(kTestCases, PPC_SETTINGS_marov_count_letters));
+const auto kAllTestTasks =
+    std::tuple_cat(ppc::util::AddFuncTask<MarovCountLettersMpi, InType>(
+                       kTestCases, PPC_SETTINGS_marov_count_letters),
+                   ppc::util::AddFuncTask<MarovCountLettersSeq, InType>(
+                       kTestCases, PPC_SETTINGS_marov_count_letters));
 
-INSTANTIATE_TEST_SUITE_P(LetterCountFuncTests, MarovCountLettersFuncTests,
-                         ppc::util::ExpandToValues(kAllTestTasks),
-                         MarovCountLettersFuncTests::PrintTestParam);
+INSTANTIATE_TEST_SUITE_P(
+    LetterCountFuncTests, MarovCountLettersFuncTests,
+    ppc::util::ExpandToValues(kAllTestTasks),
+    MarovCountLettersFuncTests::PrintTestParam);
 
 }  // namespace
 }  // namespace marov_count_letters