X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mtp_graph.cc;h=e83c84869830b898af94965a9d35cf3815b657d0;hb=a63e176f5b016f1d5a2a7b5101544430e5d3691e;hp=0fe3cf0a79ae3c3a7f65facbb050eff4ada35cf1;hpb=968e95ae0f9bb6a7c68d1ed80f3e9055787c2311;p=mtp.git

diff --git a/mtp_graph.cc b/mtp_graph.cc
index 0fe3cf0..e83c848 100644
--- a/mtp_graph.cc
+++ b/mtp_graph.cc
@@ -205,9 +205,9 @@ void MTPGraph::compute_dp_ranks() {
   // set the distance_from_source fields to this value.
 
   int *nb_predecessors = new int[_nb_vertices];
-  int *without_predecessors = new int[_nb_vertices];
-  int *new_without_predecessors = new int[_nb_vertices];
-  int nb_without_predecessors, new_nb_without_predecessors;
+  int *without_predecessor = new int[_nb_vertices];
+  int *new_without_predecessor = new int[_nb_vertices];
+  int nb_without_predecessor, new_nb_without_predecessor;
 
   for(int k = 0; k < _nb_vertices; k++) {
     nb_predecessors[k] = 0;
@@ -216,36 +216,36 @@ void MTPGraph::compute_dp_ranks() {
   for(int k = 0; k < _nb_vertices; k++) {
     v = _vertices + k;
     for(e = v->leaving_edge_list_root; e; e = e->next_leaving_edge) {
-      tv = e->terminal_vertex - _vertices;
+      tv = int(e->terminal_vertex - _vertices);
       nb_predecessors[tv]++;
     }
   }
 
-  nb_without_predecessors = 0;
+  nb_without_predecessor = 0;
   for(int k = 0; k < _nb_vertices; k++) {
     if(nb_predecessors[k] == 0) {
-      without_predecessors[nb_without_predecessors++] = k;
+      without_predecessor[nb_without_predecessor++] = k;
     }
   }
 
   scalar_t rank = 1;
-  while(nb_without_predecessors > 0) {
-    new_nb_without_predecessors = 0;
-    for(int l = 0; l < nb_without_predecessors; l++) {
-      v = _vertices + without_predecessors[l];
+  while(nb_without_predecessor > 0) {
+    new_nb_without_predecessor = 0;
+    for(int l = 0; l < nb_without_predecessor; l++) {
+      v = _vertices + without_predecessor[l];
       v->distance_from_source = rank;
       for(e = v->leaving_edge_list_root; e; e = e->next_leaving_edge) {
-        tv = e->terminal_vertex - _vertices;
+        tv = int(e->terminal_vertex - _vertices);
         nb_predecessors[tv]--;
         ASSERT(nb_predecessors[tv] >= 0);
         if(nb_predecessors[tv] == 0) {
-          new_without_predecessors[new_nb_without_predecessors++] = tv;
+          new_without_predecessor[new_nb_without_predecessor++] = tv;
         }
       }
     }
 
-    swap(without_predecessors, new_without_predecessors);
-    nb_without_predecessors = new_nb_without_predecessors;
+    swap(without_predecessor, new_without_predecessor);
+    nb_without_predecessor = new_nb_without_predecessor;
     rank++;
   }
 
@@ -257,8 +257,8 @@ void MTPGraph::compute_dp_ranks() {
   }
 
   delete[] nb_predecessors;
-  delete[] without_predecessors;
-  delete[] new_without_predecessors;
+  delete[] without_predecessor;
+  delete[] new_without_predecessor;
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -466,13 +466,13 @@ int MTPGraph::retrieve_one_path(Edge *e, Path *path) {
   int l = 0, nb_occupied_next;
 
   if(path) {
-    path->nodes[l++] = e->origin_vertex - _vertices;
+    path->nodes[l++] = int(e->origin_vertex - _vertices);
     path->length = e->length;
   } else l++;
 
   while(e->terminal_vertex != _sink) {
     if(path) {
-      path->nodes[l++] = e->terminal_vertex - _vertices;
+      path->nodes[l++] = int(e->terminal_vertex - _vertices);
       path->length += e->length;
     } else l++;
 
@@ -497,7 +497,7 @@ int MTPGraph::retrieve_one_path(Edge *e, Path *path) {
   }
 
   if(path) {
-    path->nodes[l++] = e->terminal_vertex - _vertices;
+    path->nodes[l++] = int(e->terminal_vertex - _vertices);
     path->length += e->length;
   } else l++;