X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mtp_graph.cc;h=a60e532587bca4cb184a855abd629e6cbc8a2023;hb=6e7fbc025b89997ae663bda0696eca80a6d3f93b;hp=c213a07ed51bab57f183432f24797921f4f9998f;hpb=fda29b3422f4850d77e4b8f4916251509789d3ac;p=mtp.git

diff --git a/mtp_graph.cc b/mtp_graph.cc
index c213a07..a60e532 100644
--- a/mtp_graph.cc
+++ b/mtp_graph.cc
@@ -33,7 +33,7 @@ public:
   // These are the links in the origin_vertex leaving edge list
   Edge *next_leaving_edge, *pred_leaving_edge;
 
-  inline void revert();
+  inline void invert();
 };
 
 class Vertex {
@@ -52,7 +52,7 @@ public:
 
 //////////////////////////////////////////////////////////////////////
 
-void Edge::revert() {
+void Edge::invert() {
   length = - length;
   positivized_length = 0;
   origin_vertex->del_edge(this);
@@ -83,17 +83,6 @@ void Vertex::del_edge(Edge *e) {
 
 //////////////////////////////////////////////////////////////////////
 
-Path::Path(int l) {
-  length = l;
-  nodes = new int[length];
-}
-
-Path::~Path() {
-  delete[] nodes;
-}
-
-//////////////////////////////////////////////////////////////////////
-
 MTPGraph::MTPGraph(int nb_vertices, int nb_edges,
                    int *from, int *to,
                    int source, int sink) {
@@ -152,15 +141,21 @@ void MTPGraph::print(ostream *os) {
 
 void MTPGraph::print_dot(ostream *os) {
   (*os) << "digraph {" << endl;
-  (*os) << "  node[shape=circle];" << endl;
+  // (*os) << "        node [shape=circle];" << endl;
+  (*os) << "        edge [color=gray]" << endl;
+  (*os) << "        " << _source->id << " [peripheries=2];" << endl;
+  (*os) << "        " << _sink->id << " [peripheries=2];" << 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) {
-      (*os) << "  " << e->origin_vertex->id << " -> " << e->terminal_vertex->id
+      (*os) << "        " << e->origin_vertex->id << " -> " << e->terminal_vertex->id
            << " [style=bold,color=black,label=\"" << e->length << "\"];" << endl;
     } else {
-      (*os) << "  " << e->origin_vertex->id << " -> " << e->terminal_vertex->id
-           << " [color=gray,label=\"" << e->length << "\"];" << endl;
+      (*os) << "        " << e->origin_vertex->id << " -> " << e->terminal_vertex->id
+           << " [label=\"" << e->length << "\"];" << endl;
     }
   }
   (*os) << "}" << endl;
@@ -185,26 +180,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 +230,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) {
@@ -302,7 +301,7 @@ void MTPGraph::find_best_paths(scalar_t *lengths) {
         while(v->best_pred_edge_to_source) {
           e = v->best_pred_edge_to_source;
           v = e->origin_vertex;
-          e->revert();
+          e->invert();
           // This is the only place where we change the occupations of
           // edges
           e->occupied = 1 - e->occupied;
@@ -314,12 +313,12 @@ void MTPGraph::find_best_paths(scalar_t *lengths) {
 
   for(int k = 0; k < _nb_edges; k++) {
     Edge *e = _edges + k;
-    if(e->occupied) { e->revert(); }
+    if(e->occupied) { e->invert(); }
   }
 }
 
 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; }