retrieve_paths seems to work!

diff --git a/mtp_graph.cc b/mtp_graph.cc
index b83871d..8c79416 100644 (file)
--- a/mtp_graph.cc
+++ b/mtp_graph.cc
@@ -20,6 +20,7 @@
 
 #include <iostream>
 #include <float.h>
+#include <stdlib.h>
 
 using namespace std;
 
@@ -82,6 +83,17 @@ 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) {
@@ -306,6 +318,38 @@ void MTPGraph::find_best_paths(scalar_t *lengths, int *result_edge_occupation) {
   }
 }
 
+
+int MTPGraph::retrieve_one_path(Edge *e, int *nodes) {
+  Edge *f, *next;
+  int l = 0;
+
+  if(nodes) { nodes[l++] = e->origin_vertex->id; }
+  else l++;
+
+  while(e->terminal_vertex != _sink) {
+    if(nodes) { nodes[l++] = e->terminal_vertex->id; }
+    else l++;
+    int nb_choices = 0;
+    for(f = e->terminal_vertex->leaving_edges; f; f = f->next_leaving_edge) {
+      if(f->occupied) { nb_choices++; next = f; }
+      if(nb_choices == 0) {
+        cerr << "Non-sink path end point?!" << endl;
+        abort();
+      }
+      if(nb_choices > 1) {
+        cerr << "Non node-disjoint path, can not retrieve." << endl;
+        abort();
+      }
+    }
+    e = next;
+  }
+
+  if(nodes) { nodes[l++] = e->terminal_vertex->id; }
+  else l++;
+
+  return l;
+}
+
 void MTPGraph::retrieve_paths() {
   Edge *e;
 
@@ -322,7 +366,9 @@ void MTPGraph::retrieve_paths() {
   int p = 0;
   for(e = _source->leaving_edges; e; e = e->next_leaving_edge) {
     if(e->occupied) {
-      paths[p] = new Path();
+      int l = retrieve_one_path(e, 0);
+      paths[p] = new Path(l);
+      retrieve_one_path(e, paths[p]->nodes);
       p++;
     }
   }

diff --git a/mtp_graph.h b/mtp_graph.h
index e465688..17dd222 100644 (file)
--- a/mtp_graph.h
+++ b/mtp_graph.h
@@ -26,8 +26,9 @@ class Edge;
 
 class Path {
 public:
-  int starting_time;
-  int duration;
+  Path(int l);
+  ~Path();
+  int length;
   int *nodes;
 };
 
@@ -36,6 +37,7 @@ class MTPGraph {
   void update_positivized_lengths();
   void force_positivized_lengths();
   void find_shortest_path(Vertex **front, Vertex **new_front);
+  int retrieve_one_path(Edge *e, int *nodes);
 
   Vertex **_front, **_new_front;
 

diff --git a/tracker.cc b/tracker.cc
index 4d5ebe7..4b7375f 100644 (file)
--- a/tracker.cc
+++ b/tracker.cc
@@ -140,6 +140,15 @@ void Tracker::track() {
 
   _graph->find_best_paths(_edge_lengths, _edge_occupation);
   _graph->retrieve_paths();
+
+  for(int p = 0; p < _graph->nb_paths; p++) {
+    Path *path = _graph->paths[p];
+    cout << "PATH " << p << " [length " << path->length << "] " << path->nodes[0];
+    for(int n = 1; n < path->length; n++) {
+      cout << " -> " << path->nodes[n];
+    }
+    cout << endl;
+  }
   // _graph->print_dot();
 }