refactor(shm): output total edge weight, reorder definitions

KaHIP · Feb 4, 2025 · dd0a5af · dd0a5af
1 parent 8435fb3
commit dd0a5af
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/kaminpar-shm/kaminpar.h b/kaminpar-shm/kaminpar.h
@@ -74,9 +74,9 @@ using UnsignedEdgeWeight = std::uint64_t;
 using UnsignedNodeWeight = std::uint64_t;
 #else  // KAMINPAR_64BIT_WEIGHTS
 using NodeWeight = std::int32_t;
+using UnsignedNodeWeight = std::uint32_t;
 using EdgeWeight = std::int32_t;
 using UnsignedEdgeWeight = std::uint32_t;
-using UnsignedNodeWeight = std::uint32_t;
 #endif // KAMINPAR_64BIT_WEIGHTS
 
 using BlockID = std::uint32_t;
@@ -112,9 +112,9 @@ typedef uint64_t kaminpar_unsigned_edge_weight_t;
 typedef uint64_t kaminpar_unsigned_node_weight_t;
 #else  // KAMINPAR_64BIT_WEIGHTS
 typedef int32_t kaminpar_node_weight_t;
+typedef uint32_t kaminpar_unsigned_node_weight_t;
 typedef int32_t kaminpar_edge_weight_t;
 typedef uint32_t kaminpar_unsigned_edge_weight_t;
-typedef uint32_t kaminpar_unsigned_node_weight_t;
 #endif // KAMINPAR_64BIT_WEIGHTS
 
 typedef uint32_t kaminpar_block_id_t;

diff --git a/kaminpar-shm/partitioning/deep/deep_multilevel.cc b/kaminpar-shm/partitioning/deep/deep_multilevel.cc
@@ -139,7 +139,8 @@ const Graph *DeepMultilevelPartitioner::coarsen() {
     );
     LOG << "Coarsening -> Level " << _coarsener->level()
         << " [max cluster weight: " << max_cluster_weight << "]:";
-    LOG << " Number of nodes: " << c_graph->n() << " | Number of edges: " << c_graph->m();
+    LOG << " Total egde weight:   " << static_cast<std::uint64_t>(c_graph->total_edge_weight());
+    LOG << " Number of nodes:     " << c_graph->n() << " | Number of edges: " << c_graph->m();
     LOG << " Maximum node weight: " << c_graph->max_node_weight();
     LOG;
   }