update

Author: tonibohnlein

include/osp/bsp/model/BspInstance.hpp

@@ -150,7 +150,7 @@ class BspInstance {
      */
     inline Graph_t &getComputationalDag() { return cdag; }
 
-    inline std::size_t numberOfVertices() const { return cdag.num_vertices(); }
+    inline vertex_idx_t<Graph_t> numberOfVertices() const { return cdag.num_vertices(); }
 
     inline auto vertices() const { return cdag.vertices(); }
 

include/osp/coarser/coarser_util.hpp

@@ -419,7 +419,7 @@ invert_vertex_expansion_map(const std::vector<std::vector<vertex_idx_t<Graph_t_i
     std::vector<vertex_idx_t<Graph_t_out>> vertex_contraction_map(num_vert);
     for (std::size_t i = 0; i < vertex_expansion_map.size(); i++) {
         for (const vertex_idx_t<Graph_t_in> &vert : vertex_expansion_map[i]) {
-            vertex_contraction_map[vert] = i;
+            vertex_contraction_map[vert] = static_cast<vertex_idx_t<Graph_t_out>>(i);
         }
     }
 

include/osp/dag_divider/isomorphism_divider/MerkleHashComputer.hpp

@@ -62,7 +62,7 @@ class MerkleHashComputer : public HashComputer<vertex_idx_t<Graph_t>> {
             std::sort(parent_child_hashes.begin(),parent_child_hashes.end());
 
             std::size_t hash = node_hash_func(v);
-            for (const VertexType& pc_hash : parent_child_hashes) {
+            for (const auto& pc_hash : parent_child_hashes) {
                 hash_combine(hash, pc_hash); 
             }
 

include/osp/graph_implementations/adj_list_impl/computational_dag_edge_idx_vector_impl.hpp

@@ -149,8 +149,8 @@ class computational_dag_edge_idx_vector_impl {
 
     virtual ~computational_dag_edge_idx_vector_impl() = default;
 
-    inline vertex_idx num_edges() const { return edges_.size(); }
-    inline vertex_idx num_vertices() const { return vertices_.size(); }
+    inline vertex_idx num_edges() const { return static_cast<vertex_idx>(edges_.size()); }
+    inline vertex_idx num_vertices() const { return static_cast<vertex_idx>(vertices_.size()); }
 
     inline auto edges() const { return edge_range_vector_impl<ThisT>(*this); }
 
@@ -162,8 +162,8 @@ class computational_dag_edge_idx_vector_impl {
     inline const std::vector<directed_edge_descriptor> &in_edges(vertex_idx v) const { return in_edges_[v]; }
     inline const std::vector<directed_edge_descriptor> &out_edges(vertex_idx v) const { return out_edges_[v]; }
 
-    inline vertex_idx in_degree(vertex_idx v) const { return in_edges_[v].size(); }
-    inline vertex_idx out_degree(vertex_idx v) const { return out_edges_[v].size(); }
+    inline vertex_idx in_degree(vertex_idx v) const { return static_cast<vertex_idx>(in_edges_[v].size()); }
+    inline vertex_idx out_degree(vertex_idx v) const { return static_cast<vertex_idx>(out_edges_[v].size()); }
 
     inline edge_comm_weight_type edge_comm_weight(directed_edge_descriptor e) const {
         return edges_[e.idx].comm_weight;

include/osp/graph_implementations/adj_list_impl/computational_dag_vector_impl.hpp

@@ -125,9 +125,9 @@ class computational_dag_vector_impl {
 
     inline const std::vector<vertex_idx> &children(const vertex_idx v) const { return out_neigbors[v]; }
 
-    inline vertex_idx in_degree(const vertex_idx v) const { return in_neigbors[v].size(); }
+    inline vertex_idx in_degree(const vertex_idx v) const { return static_cast<vertex_idx>(in_neigbors[v].size()); }
 
-    inline vertex_idx out_degree(const vertex_idx v) const { return out_neigbors[v].size(); }
+    inline vertex_idx out_degree(const vertex_idx v) const { return static_cast<vertex_idx>(out_neigbors[v].size()); }
 
     inline vertex_work_weight_type vertex_work_weight(const vertex_idx v) const { return vertices_[v].work_weight; }
 

include/osp/graph_implementations/adj_list_impl/dag_vector_adapter.hpp

@@ -137,9 +137,9 @@ class dag_vector_adapter {
 
     inline auto children(const vertex_idx v) const { return vector_cast_view<index_t, vertex_idx>(out_neigbors->at(v)); }
 
-    inline std::size_t in_degree(const vertex_idx v) const { return in_neigbors->at(v).size(); }
+    inline vertex_idx in_degree(const vertex_idx v) const { return static_cast<vertex_idx>(in_neigbors->at(v).size()); }
 
-    inline std::size_t out_degree(const vertex_idx v) const { return out_neigbors->at(v).size(); }
+    inline vertex_idx out_degree(const vertex_idx v) const { return static_cast<vertex_idx>(out_neigbors->at(v).size()); }
 
     inline vertex_work_weight_type vertex_work_weight(const vertex_idx v) const { return vertices_[v].work_weight; }
 

tests/graph_vector_adapter.cpp

@@ -79,7 +79,7 @@ BOOST_AUTO_TEST_CASE(test_dag_vector_adapter) {
 
     auto partition = iso_scheduler.compute_partition(instance);
 
-    graph_t corase_graph;
+    graph_constr_t corase_graph;
     coarser_util::construct_coarse_dag(instance.getComputationalDag(), corase_graph, partition);
     bool acyc = is_acyclic(corase_graph);
     BOOST_CHECK(acyc);