X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mtp_graph.cc;h=7167cf6c7c3179d97eb1a2b378cd7bba2bc20dcc;hb=3228d8c6786e4dfc90dc08a1bd2c8640d0b1052d;hp=8c79416de072436ebd17ad2b0d526e16c3180111;hpb=8db91faf223fcb893b589c7b85d4ef5e03ffb6ce;p=mtp.git

diff --git a/mtp_graph.cc b/mtp_graph.cc
index 8c79416..7167cf6 100644
--- a/mtp_graph.cc
+++ b/mtp_graph.cc
@@ -135,35 +135,38 @@ MTPGraph::~MTPGraph() {
 
 //////////////////////////////////////////////////////////////////////
 
-void MTPGraph::print() {
+void MTPGraph::print(ostream *os) {
   for(int k = 0; k < _nb_edges; k++) {
     Edge *e = _edges + k;
-    cout << e->origin_vertex->id
+    (*os) << e->origin_vertex->id
          << " -> "
          << e->terminal_vertex->id
          << " "
          << e->length;
     if(e->occupied) {
-      cout << " *";
+      (*os) << " *";
     }
-    cout << endl;
+    (*os) << endl;
   }
 }
 
-void MTPGraph::print_dot() {
-  cout << "digraph {" << endl;
-  cout << "  node[shape=circle];" << endl;
+void MTPGraph::print_dot(ostream *os) {
+  (*os) << "digraph {" << endl;
+  (*os) << "  node[shape=circle];" << endl;
   for(int k = 0; k < _nb_edges; k++) {
     Edge *e = _edges + k;
+    // (*os) << "  " << e->origin_vertex->id << " -> " << e->terminal_vertex->id
+          // << ";"
+          // << endl;
     if(e->occupied) {
-      cout << "  " << e->origin_vertex->id << " -> " << e->terminal_vertex->id
-           << " [style=bold,color=black,label=\"" << -e->length << "\"];" << endl;
+      (*os) << "  " << e->origin_vertex->id << " -> " << e->terminal_vertex->id
+           << " [style=bold,color=black,label=\"" << e->length << "\"];" << endl;
     } else {
-      cout << "  " << e->origin_vertex->id << " -> " << e->terminal_vertex->id
+      (*os) << "  " << e->origin_vertex->id << " -> " << e->terminal_vertex->id
            << " [color=gray,label=\"" << e->length << "\"];" << endl;
     }
   }
-  cout << "}" << endl;
+  (*os) << "}" << endl;
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -185,26 +188,29 @@ void MTPGraph::initialize_positivized_lengths_with_min() {
 void MTPGraph::update_positivized_lengths() {
   for(int k = 0; k < _nb_edges; k++) {
     Edge *e = _edges + k;
-    e->positivized_length += e->terminal_vertex->distance_from_source - e->terminal_vertex->distance_from_source;
+    e->positivized_length +=
+      e->origin_vertex->distance_from_source - e->terminal_vertex->distance_from_source;
   }
 }
 
 void MTPGraph::force_positivized_lengths() {
 #ifdef VERBOSE
   scalar_t residual_error = 0.0;
+  scalar_t max_error = 0.0;
 #endif
   for(int n = 0; n < _nb_vertices; n++) {
     for(Edge *e = _vertices[n].leaving_edges; e; e = e->next_leaving_edge) {
       if(e->positivized_length < 0) {
 #ifdef VERBOSE
         residual_error -= e->positivized_length;
+        max_error = max(max_error, fabs(e->positivized_length));
 #endif
         e->positivized_length = 0.0;
       }
     }
   }
 #ifdef VERBOSE
-  cerr << "residual_error " << residual_error << endl;
+  cerr << "residual_error " << residual_error << " max_error " << residual_error << endl;
 #endif
 }
 
@@ -232,6 +238,7 @@ void MTPGraph::find_shortest_path(Vertex **_front, Vertex **_new_front) {
   do {
     _new_front_size = 0;
     iteration++;
+
     for(int f = 0; f < _front_size; f++) {
       v = _front[f];
       for(e = v->leaving_edges; e; e = e->next_leaving_edge) {
@@ -258,13 +265,14 @@ void MTPGraph::find_shortest_path(Vertex **_front, Vertex **_new_front) {
   } while(_front_size > 0);
 }
 
-void MTPGraph::find_best_paths(scalar_t *lengths, int *result_edge_occupation) {
+void MTPGraph::find_best_paths(scalar_t *lengths) {
   scalar_t total_length;
   Vertex *v;
   Edge *e;
 
   for(int e = 0; e < _nb_edges; e++) {
     _edges[e].length = lengths[e];
+    _edges[e].occupied = 0;
     _edges[e].positivized_length = _edges[e].length;
   }
 
@@ -294,7 +302,7 @@ void MTPGraph::find_best_paths(scalar_t *lengths, int *result_edge_occupation) {
       // If that length is negative
       if(total_length < 0.0) {
 #ifdef VERBOSE
-        cout << "Found a path of length " << total_length << endl;
+        cerr << "Found a path of length " << total_length << endl;
 #endif
         // Invert all the edges along the best path
         v = _sink;
@@ -314,13 +322,11 @@ void MTPGraph::find_best_paths(scalar_t *lengths, int *result_edge_occupation) {
   for(int k = 0; k < _nb_edges; k++) {
     Edge *e = _edges + k;
     if(e->occupied) { e->revert(); }
-    result_edge_occupation[k] = e->occupied;
   }
 }
 
-
 int MTPGraph::retrieve_one_path(Edge *e, int *nodes) {
-  Edge *f, *next;
+  Edge *f, *next = 0;
   int l = 0;
 
   if(nodes) { nodes[l++] = e->origin_vertex->id; }
@@ -350,7 +356,7 @@ int MTPGraph::retrieve_one_path(Edge *e, int *nodes) {
   return l;
 }
 
-void MTPGraph::retrieve_paths() {
+void MTPGraph::retrieve_disjoint_paths() {
   Edge *e;
 
   for(int p = 0; p < nb_paths; p++) delete paths[p];
@@ -372,6 +378,4 @@ void MTPGraph::retrieve_paths() {
       p++;
     }
   }
-
-  cout << "NB_PATHS " << nb_paths << endl;
 }