BspSchedule, cost function revision (#52)

* clang-format

* bsp cost models

update

added isValid

revised schedules

metagreedy

unit test

unit tests

* documentation

* renaming methods

* small edits

* moved compute_lazy_communication_costs

* algorithm updates to new cost model (+sync & other fixes)

---------

Co-authored-by: ppapp <[email protected]>

Author: tonibohnlein

.clang-format

@@ -50,7 +50,7 @@ BreakConstructorInitializersBeforeComma: false
 BreakConstructorInitializers: BeforeColon
 BreakAfterJavaFieldAnnotations: false
 BreakStringLiterals: true
-ColumnLimit:     120
+ColumnLimit:     0
 CommentPragmas:  '^ IWYU pragma:'
 CompactNamespaces: true
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
@@ -134,4 +134,3 @@ TabWidth:        8
 UseCRLF:         false
 UseTab:          Never
 ...
-

.githooks/pre-commit

@@ -47,28 +47,24 @@ fi
 
 
 # Format all .cpp and .hpp files
-for file in $(git diff --cached --name-only | grep -E '\.cpp$|\.hpp$'); do
-	# Check if the file exists
-	if [ ! -f $file ]; then
-		continue
+# We use 'git diff-index' to avoid issues with spaces in filenames
+git diff --cached --name-only --diff-filter=ACM $against | grep -E '\.(cpp|hpp)$' | while read -r file; do
+	if [ -f "$file" ]; then
+        # Apply clang-format in-place
+        clang-format -i "$file"
+        # Re-add the file to the commit to include the formatting changes
+        git add "$file"
 	fi
-	git add $file
 done
 
-# Remove trailing whitespace from all files (except .so)
-for file in $(git diff --cached --name-only | grep -vE '\.so$'); do
-	# Check if the file exists
-	if [ ! -f $file ]; then
-		continue
+# Remove trailing whitespace from all files (except .so and binary files)
+# Using sed to remove trailing whitespace
+git diff --cached --name-only --diff-filter=ACM $against | grep -vE '\.so$' | while read -r file; do
+	if [ -f "$file" ]; then
+        # Check if file is text to avoid corrupting binaries
+        if file "$file" | grep -q "text"; then
+            sed -i 's/[[:space:]]*$//' "$file"
+            git add "$file"
+        fi
 	fi
-	git add $file
 done
-
-for file in $(git diff --cached --name-only); do
-	# Check if the file exists
-	if [ ! -f $file ]; then
-		continue
-	fi
-	git add $file
-done
-

apps/test_suite_runner/StatsModules/BspCommStatsModule.hpp

@@ -18,36 +18,36 @@ limitations under the License.
 
 #pragma once
 
-#include <string>
-#include <vector>
-#include <map>
 #include "IStatsModule.hpp"
 #include "osp/bsp/model/BspSchedule.hpp" // Still needed
+#include "osp/bsp/model/cost/BufferedSendingCost.hpp"
+#include "osp/bsp/model/cost/TotalCommunicationCost.hpp"
+#include "osp/bsp/model/cost/TotalLambdaCommunicationCost.hpp"
+#include <map>
+#include <string>
+#include <vector>
 
 namespace osp {
 
 template<typename Graph_t>
-class BspCommStatsModule : public IStatisticModule<BspSchedule<Graph_t>> { 
-public:
-
-private:
+class BspCommStatsModule : public IStatisticModule<BspSchedule<Graph_t>> {
+  public:
+  private:
     const std::vector<std::string> metric_headers = {
-        "TotalCommCost", "TotalLambdaCommCost", "BufferedSendingCosts" 
-    };
-
-public:
+        "TotalCommCost", "TotalLambdaCommCost", "BufferedSendingCosts"};
 
+  public:
     std::vector<std::string> get_metric_headers() const override {
         return metric_headers;
     }
 
     std::map<std::string, std::string> record_statistics(
-                            const BspSchedule<Graph_t>& schedule, 
-                            std::ofstream& /*log_stream*/) const override {
+        const BspSchedule<Graph_t> &schedule,
+        std::ofstream & /*log_stream*/) const override {
         std::map<std::string, std::string> stats;
-        stats["TotalCommCost"] = std::to_string(schedule.computeTotalCosts());
-        stats["TotalLambdaCommCost"] = std::to_string(schedule.computeTotalLambdaCosts());
-        stats["BufferedSendingCosts"] = std::to_string(schedule.computeBufferedSendingCosts());
+        stats["TotalCommCost"] = std::to_string(TotalCommunicationCost<Graph_t>()(schedule));
+        stats["TotalLambdaCommCost"] = std::to_string(TotalLambdaCommunicationCost<Graph_t>()(schedule));
+        stats["BufferedSendingCosts"] = std::to_string(BufferedSendingCost<Graph_t>()(schedule));
         return stats;
     }
 };