Cosmetics.

[mtp.git] / mtp_graph.cc

diff --git a/mtp_graph.cc b/mtp_graph.cc
index cc816c9..a60e532 100644 (file)
--- 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,18 +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;
@@ -239,31 +231,6 @@ void MTPGraph::find_shortest_path(Vertex **_front, Vertex **_new_front) {
     _new_front_size = 0;
     iteration++;
 
-    // for(int k = 0; k < _nb_edges; k++) {
-      // Edge *e = _edges + k;
-      // d = e->origin_vertex->distance_from_source + e->positivized_length;
-      // if(d < e->terminal_vertex->distance_from_source) {
-        // e->terminal_vertex->distance_from_source = d;
-        // _new_front_size++;
-      // }
-    // }
-
-    // for(int n = 0; n < _nb_vertices; n++) {
-      // v = &_vertices[n];
-      // for(e = v->leaving_edges; e; e = e->next_leaving_edge) {
-        // d = v->distance_from_source + e->positivized_length;
-        // tv = e->terminal_vertex;
-        // if(d < tv->distance_from_source) {
-          // tv->distance_from_source = d;
-          // tv->best_pred_edge_to_source = e;
-          // if(tv->iteration < iteration) {
-            // _new_front[_new_front_size++] = tv;
-            // tv->iteration = iteration;
-          // }
-        // }
-      // }
-    // }
-
     for(int f = 0; f < _front_size; f++) {
       v = _front[f];
       for(e = v->leaving_edges; e; e = e->next_leaving_edge) {
@@ -288,19 +255,6 @@ void MTPGraph::find_shortest_path(Vertex **_front, Vertex **_new_front) {
     _new_front_size = _front_size;
     _front_size = tmp_front_size;
   } while(_front_size > 0);
-
-#ifdef DEBUG
-  scalar_t min_delta = 0, delta;
-  for(int k = 0; k < _nb_edges; k++) {
-    Edge *e = _edges + k;
-    // d = e->origin_vertex->distance_from_source + e->positivized_length;
-    // if(d > e->terminal_vertex->distance_from_source) { abort(); }
-    delta = e->positivized_length +
-               (e->origin_vertex->distance_from_source - e->terminal_vertex->distance_from_source);
-    min_delta = min(delta, min_delta);
-  }
-  cout << "min_delta = " << delta << endl;
-#endif
 }
 
 void MTPGraph::find_best_paths(scalar_t *lengths) {
@@ -314,9 +268,6 @@ void MTPGraph::find_best_paths(scalar_t *lengths) {
     _edges[e].positivized_length = _edges[e].length;
   }
 
-  cout << "********************************************************" << endl;
-  // print_dot(&cout);
-
   // We use one iteration of find_shortest_path simply to propagate
   // the distance to make all the edge lengths positive.
   find_shortest_path(_front, _new_front);
@@ -350,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;
@@ -362,7 +313,7 @@ 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(); }
   }
 }