minor adjustments

vovatrykoz · Dec 9, 2024 · 47b5afd · 47b5afd
1 parent a3dd548
commit 47b5afd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 25 deletions.
diff --git a/source/Analysis.cpp b/source/Analysis.cpp
@@ -29,12 +29,10 @@ std::multiset<TimedPath> analysis::removePathsProducingDublicateValues(
 
     int totalTaskCount = pathSet.size();
     for (const auto& currentPath : pathSet) {
-        // Keep track of paths that are not considered duplicates
-        int counter = 0;
+        bool isDuplicate = false;
 
         for (const auto& otherPath : pathSet) {
             if (currentPath == otherPath) {
-                counter++;
                 continue;
             }
 
@@ -48,13 +46,12 @@ std::multiset<TimedPath> analysis::removePathsProducingDublicateValues(
 
             if (pathInstancesHaveSameStart &&
                 currentInstanceFinishesLaterThanOther) {
+                isDuplicate = true;
                 break;
             }
-
-            counter++;
         }
 
-        if (counter == totalTaskCount) {
+        if (!isDuplicate) {
             output.insert(currentPath);
         }
     }
@@ -88,17 +85,15 @@ int analysis::getOverarchingDelay(const std::multiset<TimedPath>& pathSet) {
         std::optional<TimedPath> predecessor =
             findPredecessor(currentPath, pathSet);
 
-        int addend = 0;
+        int delayAdjustment = 0;
         if (predecessor.has_value()) {
-            addend = currentPath.firstTaskActivationTime() -
-                     predecessor->firstTaskActivationTime();
+            delayAdjustment = currentPath.firstTaskActivationTime() -
+                              predecessor->firstTaskActivationTime();
         }
 
-        int firstToLastDelay = currentPath.endToEndDelay() + addend;
+        int firstToLastDelay = currentPath.endToEndDelay() + delayAdjustment;
 
-        if (firstToLastDelay > maxDelay) {
-            maxDelay = firstToLastDelay;
-        }
+        maxDelay = std::max(maxDelay, firstToLastDelay);
     }
 
     return maxDelay;

diff --git a/source/Setup.cpp b/source/Setup.cpp
@@ -18,9 +18,9 @@ using namespace e2e::io;
 std::optional<setup::SupportedLogger> setup::getSupportedLoggerFromString(
     const std::string& loggerStr) {
     std::string lowercaseLoggerStr;
-    std::transform(loggerStr.begin(), loggerStr.end(), std::back_inserter(lowercaseLoggerStr), [](unsigned char c) {
-        return std::tolower(c);
-    });
+    std::transform(loggerStr.begin(), loggerStr.end(),
+                   std::back_inserter(lowercaseLoggerStr),
+                   [](unsigned char c) { return std::tolower(c); });
 
     if (lowercaseLoggerStr == "console") {
         return SupportedLogger::Console;
@@ -36,9 +36,9 @@ std::optional<setup::SupportedLogger> setup::getSupportedLoggerFromString(
 std::optional<setup::SupportedLogger> setup::getSupportedSimpleLoggerFromString(
     const std::string& loggerStr) {
     std::string lowercaseLoggerStr;
-    std::transform(loggerStr.begin(), loggerStr.end(), std::back_inserter(lowercaseLoggerStr), [](unsigned char c) {
-        return std::tolower(c);
-    });
+    std::transform(loggerStr.begin(), loggerStr.end(),
+                   std::back_inserter(lowercaseLoggerStr),
+                   [](unsigned char c) { return std::tolower(c); });
 
     if (lowercaseLoggerStr == "console") {
         return SupportedLogger::SimplifiedConsole;
@@ -54,9 +54,9 @@ std::optional<setup::SupportedLogger> setup::getSupportedSimpleLoggerFromString(
 std::optional<setup::SupportedTaskInstanceReader>
 setup::getSupportedTaskInstanceReaderFromString(const std::string& readerStr) {
     std::string lowercaseReaderStr;
-    std::transform(readerStr.begin(), readerStr.end(), std::back_inserter(lowercaseReaderStr), [](unsigned char c) {
-        return std::tolower(c);
-    });
+    std::transform(readerStr.begin(), readerStr.end(),
+                   std::back_inserter(lowercaseReaderStr),
+                   [](unsigned char c) { return std::tolower(c); });
 
     if (lowercaseReaderStr == "console") {
         return SupportedTaskInstanceReader::Console;
@@ -72,9 +72,9 @@ setup::getSupportedTaskInstanceReaderFromString(const std::string& readerStr) {
 std::optional<setup::SupportedTaskReader>
 setup::getSupportedTaskReaderFromString(const std::string& readerStr) {
     std::string lowercaseReaderStr;
-    std::transform(readerStr.begin(), readerStr.end(), std::back_inserter(lowercaseReaderStr), [](unsigned char c) {
-        return std::tolower(c);
-    });
+    std::transform(readerStr.begin(), readerStr.end(),
+                   std::back_inserter(lowercaseReaderStr),
+                   [](unsigned char c) { return std::tolower(c); });
 
     if (lowercaseReaderStr == "console") {
         return SupportedTaskReader::Console;