X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mtp_graph.cc;h=32bdfdfe69dfe292db6d63749947e0eed09488c1;hb=8946d0df4263aa20a670cedd5d61f9709b858fca;hp=b83871d4df3d7065a325fb552760987d009df5cb;hpb=340972b07aa40e812a99ecd2bced570cdd5eed84;p=mtp.git

diff --git a/mtp_graph.cc b/mtp_graph.cc
index b83871d..32bdfdf 100644
--- 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) {
@@ -246,7 +258,7 @@ void MTPGraph::find_shortest_path(Vertex **_front, Vertex **_new_front) {
   } while(_front_size > 0);
 }
 
-void MTPGraph::find_best_paths(scalar_t *lengths, int *result_edge_occupation) {
+void MTPGraph::find_best_paths(scalar_t *lengths) {
   scalar_t total_length;
   Vertex *v;
   Edge *e;
@@ -302,11 +314,41 @@ void MTPGraph::find_best_paths(scalar_t *lengths, int *result_edge_occupation) {
   for(int k = 0; k < _nb_edges; k++) {
     Edge *e = _edges + k;
     if(e->occupied) { e->revert(); }
-    result_edge_occupation[k] = e->occupied;
   }
 }
 
-void MTPGraph::retrieve_paths() {
+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_disjoint_paths() {
   Edge *e;
 
   for(int p = 0; p < nb_paths; p++) delete paths[p];
@@ -322,10 +364,10 @@ 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++;
     }
   }
-
-  cout << "NB_PATHS " << nb_paths << endl;
 }