X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mtp_graph.cc;h=8160211ca6ed0dc9c41587e46c3b72723ed349c3;hb=15ad4100d5f4d7e3e15ea807c9bef8002fa9c177;hp=590bdb245c2ad785b2024d359d7da450556413d5;hpb=3070f21d61377aff06255fa5cfe92d0111d70117;p=mtp.git

diff --git a/mtp_graph.cc b/mtp_graph.cc
index 590bdb2..8160211 100644
--- a/mtp_graph.cc
+++ b/mtp_graph.cc
@@ -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,17 +141,19 @@ 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) << "        " << _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
+      (*os) << "        " << e->origin_vertex->id << " -> " << e->terminal_vertex->id
            << " [color=gray,label=\"" << e->length << "\"];" << endl;
     }
   }
@@ -239,31 +230,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 +254,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 VERBOSE
-  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) {