Wsign-compare

Author: tonibohnlein

include/osp/bsp/model/BspSchedule.hpp

@@ -237,7 +237,7 @@ class BspSchedule : public IBspSchedule<Graph_t>, public IBspScheduleEval<Graph_
      */
     void updateNumberOfSupersteps() {
         number_of_supersteps = 0;
-        for (unsigned i = 0; i < instance->numberOfVertices(); ++i) {
+        for (vertex_idx_t<Graph_t> i = 0; i < instance->numberOfVertices(); ++i) {
             if (node_to_superstep_assignment[i] >= number_of_supersteps) {
                 number_of_supersteps = node_to_superstep_assignment[i] + 1;
             }
@@ -327,7 +327,7 @@ class BspSchedule : public IBspSchedule<Graph_t>, public IBspScheduleEval<Graph_
 
             number_of_supersteps = 0;
 
-            for (unsigned i = 0; i < instance->numberOfVertices(); ++i) {
+            for (vertex_idx_t<Graph_t> i = 0; i < instance->numberOfVertices(); ++i) {
 
                 if (vec[i] >= number_of_supersteps) {
                     number_of_supersteps = vec[i] + 1;
@@ -550,8 +550,8 @@ class BspSchedule : public IBspSchedule<Graph_t>, public IBspScheduleEval<Graph_
      */
     inline bool satisfiesPrecedenceConstraints() const {
 
-        if (node_to_processor_assignment.size() != instance->numberOfVertices() ||
-            node_to_superstep_assignment.size() != instance->numberOfVertices()) {
+        if (static_cast<vertex_idx_t<Graph_t>>(node_to_processor_assignment.size()) != instance->numberOfVertices() ||
+            static_cast<vertex_idx_t<Graph_t>>(node_to_superstep_assignment.size()) != instance->numberOfVertices()) {
             return false;
         }
 

include/osp/bsp/model/VectorSchedule.hpp

@@ -58,7 +58,7 @@ class VectorSchedule : public IBspSchedule<Graph_t> {
         node_to_superstep_assignment =
             std::vector<unsigned>(schedule.getInstance().numberOfVertices(), schedule.numberOfSupersteps());
 
-        for (unsigned i = 0; i < schedule.getInstance().numberOfVertices(); i++) {
+        for (vertex_idx_t<Graph_t> i = 0; i < schedule.getInstance().numberOfVertices(); i++) {
 
             node_to_processor_assignment[i] = schedule.assignedProcessor(i);
             node_to_superstep_assignment[i] = schedule.assignedSuperstep(i);
@@ -78,7 +78,7 @@ class VectorSchedule : public IBspSchedule<Graph_t> {
                 std::vector<unsigned>(instance->numberOfVertices(), instance->numberOfProcessors());
             node_to_superstep_assignment = std::vector<unsigned>(instance->numberOfVertices(), number_of_supersteps);
 
-            for (unsigned i = 0; i < instance->numberOfVertices(); i++) {
+            for (vertex_idx_t<Graph_t> i = 0; i < instance->numberOfVertices(); i++) {
                 node_to_processor_assignment[i] = other.assignedProcessor(i);
                 node_to_superstep_assignment[i] = other.assignedSuperstep(i);
             }

include/osp/bsp/scheduler/Serial.hpp

@@ -101,7 +101,7 @@ class Serial : public Scheduler<Graph_t> {
             }
         }
 
-        size_t scheduled_nodes_count = 0;
+        vertex_idx_t<Graph_t> scheduled_nodes_count = 0;
         unsigned current_superstep = 0;
 
         while (scheduled_nodes_count < num_vertices) {