Removed the id fields, now compute it from the memory address.

[mtp.git] / mtp_graph.cc

diff --git a/mtp_graph.cc b/mtp_graph.cc
index c456601..5371732 100644 (file)
--- a/mtp_graph.cc
+++ b/mtp_graph.cc
@@ -24,18 +24,18 @@
 
 #include "mtp_graph.h"
 
-// #include <iostream>
 #include <float.h>
 
 using namespace std;
 
 class Edge {
 public:
-  int id, occupied;
+  int occupied;
   scalar_t length, positivized_length;
   Vertex *origin_vertex, *terminal_vertex;
 
-  // These are the links in the origin_vertex leaving edge list
+  // These fields are used for the linked list of a vertex's leaving
+  // edge list. We have to do insertions / deletions.
   Edge *next_leaving_edge, *pred_leaving_edge;
 
   inline void invert();
@@ -43,7 +43,6 @@ public:
 
 class Vertex {
 public:
-  int id;
   Edge *leaving_edges;
   scalar_t distance_from_source;
   Edge *pred_edge_toward_source;
@@ -110,14 +109,9 @@ MTPGraph::MTPGraph(int nb_vertices, int nb_edges,
   _source = &_vertices[source];
   _sink = &_vertices[sink];
 
-  for(int k = 0; k < _nb_vertices; k++) {
-    _vertices[k].id = k;
-  }
-
   for(int e = 0; e < nb_edges; e++) {
     _vertices[vertex_from[e]].add_leaving_edge(_edges + e);
     _edges[e].occupied = 0;
-    _edges[e].id = e;
     _edges[e].origin_vertex = _vertices + vertex_from[e];
     _edges[e].terminal_vertex = _vertices + vertex_to[e];
   }
@@ -140,9 +134,9 @@ MTPGraph::~MTPGraph() {
 void MTPGraph::print(ostream *os) {
   for(int k = 0; k < _nb_edges; k++) {
     Edge *e = _edges + k;
-    (*os) << e->origin_vertex->id
+    (*os) << e->origin_vertex - _vertices
          << " -> "
-         << e->terminal_vertex->id
+         << e->terminal_vertex - _vertices
          << " "
          << e->length;
     if(e->occupied) {
@@ -157,14 +151,14 @@ void MTPGraph::print_dot(ostream *os) {
   (*os) << "        rankdir=\"LR\";" << endl;
   (*os) << "        node [shape=circle,width=0.75,fixedsize=true];" << endl;
   (*os) << "        edge [color=gray,arrowhead=open]" << endl;
-  (*os) << "        " << _source->id << " [peripheries=2];" << endl;
-  (*os) << "        " << _sink->id << " [peripheries=2];" << endl;
+  (*os) << "        " << _source - _vertices << " [peripheries=2];" << endl;
+  (*os) << "        " << _sink - _vertices << " [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;
-    (*os) << "        " << e->origin_vertex->id << " -> " << e->terminal_vertex->id
+    (*os) << "        "
+          << e->origin_vertex - _vertices
+          << " -> "
+          << e->terminal_vertex - _vertices
           << " [";
     if(e->occupied) {
       (*os) << "style=bold,color=black,";
@@ -377,29 +371,31 @@ void MTPGraph::find_best_paths(scalar_t *lengths) {
 
 int MTPGraph::retrieve_one_path(Edge *e, Path *path) {
   Edge *f, *next = 0;
-  int l = 0;
+  int l = 0, nb_occupied_next;
 
   if(path) {
-    path->nodes[l++] = e->origin_vertex->id;
+    path->nodes[l++] = e->origin_vertex - _vertices;
     path->length = e->length;
   } else l++;
 
   while(e->terminal_vertex != _sink) {
     if(path) {
-      path->nodes[l++] = e->terminal_vertex->id;
+      path->nodes[l++] = e->terminal_vertex - _vertices;
       path->length += e->length;
     } else l++;
-    int nb_choices = 0;
+
+    nb_occupied_next = 0;
     for(f = e->terminal_vertex->leaving_edges; f; f = f->next_leaving_edge) {
-      if(f->occupied) { nb_choices++; next = f; }
+      if(f->occupied) { nb_occupied_next++; next = f; }
     }
 
 #ifdef DEBUG
-    if(nb_choices == 0) {
+    if(nb_occupied_next == 0) {
       cerr << "retrieve_one_path: Non-sink end point." << endl;
       abort();
     }
-    if(nb_choices > 1) {
+
+    else if(nb_occupied_next > 1) {
       cerr << "retrieve_one_path: Non node-disjoint paths." << endl;
       abort();
     }
@@ -409,7 +405,7 @@ int MTPGraph::retrieve_one_path(Edge *e, Path *path) {
   }
 
   if(path) {
-    path->nodes[l++] = e->terminal_vertex->id;
+    path->nodes[l++] = e->terminal_vertex - _vertices;
     path->length += e->length;
   } else l++;
 
@@ -418,6 +414,7 @@ int MTPGraph::retrieve_one_path(Edge *e, Path *path) {
 
 void MTPGraph::retrieve_disjoint_paths() {
   Edge *e;
+  int p, l;
 
   for(int p = 0; p < nb_paths; p++) delete paths[p];
   delete[] paths;
@@ -429,10 +426,10 @@ void MTPGraph::retrieve_disjoint_paths() {
 
   paths = new Path *[nb_paths];
 
-  int p = 0;
+  p = 0;
   for(e = _source->leaving_edges; e; e = e->next_leaving_edge) {
     if(e->occupied) {
-      int l = retrieve_one_path(e, 0);
+      l = retrieve_one_path(e, 0);
       paths[p] = new Path(l);
       retrieve_one_path(e, paths[p]);
       p++;