X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mtp_graph.cc;h=0fe3cf0a79ae3c3a7f65facbb050eff4ada35cf1;hb=33ee808c4048b9cb179a39c7de6aaa468d95ef2d;hp=7167cf6c7c3179d97eb1a2b378cd7bba2bc20dcc;hpb=3228d8c6786e4dfc90dc08a1bd2c8640d0b1052d;p=mtp.git
diff --git a/mtp_graph.cc b/mtp_graph.cc
index 7167cf6..0fe3cf0 100644
--- a/mtp_graph.cc
+++ b/mtp_graph.cc
@@ -1,190 +1,304 @@
-///////////////////////////////////////////////////////////////////////////
-// This program is free software: you can redistribute it and/or modify //
-// it under the terms of the version 3 of the GNU General Public License //
-// as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// You should have received a copy of the GNU General Public License //
-// along with this program. If not, see . //
-// //
-// Written by and Copyright (C) Francois Fleuret //
-// Contact for comments & bug reports //
-///////////////////////////////////////////////////////////////////////////
+/*
+ * mtp is the ``Multi Tracked Paths'', an implementation of the
+ * k-shortest paths algorithm for multi-target tracking.
+ *
+ * Copyright (c) 2012 Idiap Research Institute, http://www.idiap.ch/
+ * Written by Francois Fleuret
+ *
+ * This file is part of mtp.
+ *
+ * mtp is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * mtp is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with selector. If not, see .
+ *
+ */
#include "mtp_graph.h"
-#include
+#include
#include
-#include
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 revert();
+ inline void invert();
};
class Vertex {
public:
- int id;
- Edge *leaving_edges;
scalar_t distance_from_source;
- Edge *best_pred_edge_to_source;
+ Edge *pred_edge_toward_source;
+
+ Edge *leaving_edge_list_root;
+ Vertex **heap_slot;
- int iteration; // Used in find_shortest_path to know if we already
- // added this vertex to the front
Vertex();
- inline void add_edge(Edge *e);
- inline void del_edge(Edge *e);
+
+ inline void add_leaving_edge(Edge *e);
+ inline void del_leaving_edge(Edge *e);
+ inline void decrease_distance_in_heap(Vertex **heap);
+ inline void increase_distance_in_heap(Vertex **heap, Vertex **heap_bottom);
};
//////////////////////////////////////////////////////////////////////
-void Edge::revert() {
+void Edge::invert() {
length = - length;
- positivized_length = 0;
- origin_vertex->del_edge(this);
- terminal_vertex->add_edge(this);
- Vertex *t = terminal_vertex;
- terminal_vertex = origin_vertex;
- origin_vertex = t;
+ positivized_length = - positivized_length;
+ origin_vertex->del_leaving_edge(this);
+ terminal_vertex->add_leaving_edge(this);
+ swap(terminal_vertex, origin_vertex);
}
//////////////////////////////////////////////////////////////////////
Vertex::Vertex() {
- leaving_edges = 0;
+ leaving_edge_list_root = 0;
}
-void Vertex::add_edge(Edge *e) {
- e->next_leaving_edge = leaving_edges;
+void Vertex::add_leaving_edge(Edge *e) {
+ e->next_leaving_edge = leaving_edge_list_root;
e->pred_leaving_edge = 0;
- if(leaving_edges) { leaving_edges->pred_leaving_edge = e; }
- leaving_edges = e;
+ if(leaving_edge_list_root) {
+ leaving_edge_list_root->pred_leaving_edge = e;
+ }
+ leaving_edge_list_root = e;
}
-void Vertex::del_edge(Edge *e) {
- if(e == leaving_edges) { leaving_edges = e->next_leaving_edge; }
- if(e->pred_leaving_edge) { e->pred_leaving_edge->next_leaving_edge = e->next_leaving_edge; }
- if(e->next_leaving_edge) { e->next_leaving_edge->pred_leaving_edge = e->pred_leaving_edge; }
+void Vertex::del_leaving_edge(Edge *e) {
+ if(e == leaving_edge_list_root) {
+ leaving_edge_list_root = e->next_leaving_edge;
+ }
+ if(e->pred_leaving_edge) {
+ e->pred_leaving_edge->next_leaving_edge = e->next_leaving_edge;
+ }
+ if(e->next_leaving_edge) {
+ e->next_leaving_edge->pred_leaving_edge = e->pred_leaving_edge;
+ }
}
-//////////////////////////////////////////////////////////////////////
+void Vertex::decrease_distance_in_heap(Vertex **heap) {
+ Vertex **p, **h;
+ // There is some beauty in that
+ h = heap_slot;
+ while(h > heap &&
+ (p = heap + (h - heap + 1) / 2 - 1,
+ (*p)->distance_from_source > (*h)->distance_from_source)) {
+ swap(*p, *h);
+ swap((*p)->heap_slot, (*h)->heap_slot);
+ h = p;
+ }
+}
-Path::Path(int l) {
- length = l;
- nodes = new int[length];
+void Vertex::increase_distance_in_heap(Vertex **heap, Vertex **heap_bottom) {
+ Vertex **c1, **c2, **h;
+ // omg, that's beautiful
+ h = heap_slot;
+ while(c1 = heap + 2 * (h - heap) + 1,
+ c1 < heap_bottom &&
+ (c2 = c1 + 1,
+ (*c1)->distance_from_source < (*h)->distance_from_source
+ ||
+ (c2 < heap_bottom && (*c2)->distance_from_source < (*h)->distance_from_source)
+ )) {
+ if(c2 < heap_bottom && (*c2)->distance_from_source <= (*c1)->distance_from_source) {
+ swap(*c2, *h);
+ swap((*c2)->heap_slot, (*h)->heap_slot);
+ h = c2;
+ } else {
+ swap(*c1, *h);
+ swap((*c1)->heap_slot, (*h)->heap_slot);
+ h = c1;
+ }
+ }
}
-Path::~Path() {
- delete[] nodes;
+//////////////////////////////////////////////////////////////////////
+
+static int compare_vertices_on_distance(const void *v1, const void *v2) {
+ scalar_t delta =
+ (*((Vertex **) v1))->distance_from_source -
+ (*((Vertex **) v2))->distance_from_source;
+ if(delta < 0) return -1;
+ else if(delta > 0) return 1;
+ else return 0;
}
//////////////////////////////////////////////////////////////////////
MTPGraph::MTPGraph(int nb_vertices, int nb_edges,
- int *from, int *to,
+ int *vertex_from, int *vertex_to,
int source, int sink) {
_nb_vertices = nb_vertices;
_nb_edges = nb_edges;
_edges = new Edge[_nb_edges];
_vertices = new Vertex[_nb_vertices];
- _front = new Vertex *[_nb_vertices];
- _new_front = new Vertex *[_nb_vertices];
+ _heap = new Vertex *[_nb_vertices];
+ _dp_order = new Vertex *[_nb_vertices];
_source = &_vertices[source];
_sink = &_vertices[sink];
- for(int v = 0; v < _nb_vertices; v++) {
- _vertices[v].id = v;
- }
-
for(int e = 0; e < nb_edges; e++) {
- _vertices[from[e]].add_edge(_edges + e);
+ _vertices[vertex_from[e]].add_leaving_edge(_edges + e);
_edges[e].occupied = 0;
- _edges[e].id = e;
- _edges[e].origin_vertex = _vertices + from[e];
- _edges[e].terminal_vertex = _vertices + to[e];
+ _edges[e].origin_vertex = _vertices + vertex_from[e];
+ _edges[e].terminal_vertex = _vertices + vertex_to[e];
+ }
+
+ for(int v = 0; v < _nb_vertices; v++) {
+ _heap[v] = &_vertices[v];
+ _vertices[v].heap_slot = &_heap[v];
}
paths = 0;
nb_paths = 0;
+
+ compute_dp_ranks();
+ for(int v = 0; v < _nb_vertices; v++) { _dp_order[v] = &_vertices[v]; }
+ qsort(_dp_order, _nb_vertices, sizeof(Vertex *), compare_vertices_on_distance);
}
MTPGraph::~MTPGraph() {
delete[] _vertices;
+ delete[] _dp_order;
+ delete[] _heap;
delete[] _edges;
- delete[] _front;
- delete[] _new_front;
for(int p = 0; p < nb_paths; p++) delete paths[p];
delete[] paths;
}
//////////////////////////////////////////////////////////////////////
+void MTPGraph::compute_dp_ranks() {
+ Vertex *v;
+ Edge *e;
+ int tv;
+
+ // This procedure computes for each node the longest link from the
+ // source and abort if the graph is not a DAG. It works by removing
+ // successively nodes without predecessor: At the first iteration it
+ // removes the source, then the nodes with incoming edge only from
+ // the source, etc. If it can remove all the nodes that way, the
+ // graph is a DAG. If at some point it can not remove node anymore
+ // and there are some remaining nodes, the graph is not a DAG. The
+ // rank of a node is the iteration at which is it removed, and we
+ // set the distance_from_source fields to this value.
+
+ int *nb_predecessors = new int[_nb_vertices];
+ int *without_predecessors = new int[_nb_vertices];
+ int *new_without_predecessors = new int[_nb_vertices];
+ int nb_without_predecessors, new_nb_without_predecessors;
+
+ for(int k = 0; k < _nb_vertices; k++) {
+ nb_predecessors[k] = 0;
+ }
+
+ for(int k = 0; k < _nb_vertices; k++) {
+ v = _vertices + k;
+ for(e = v->leaving_edge_list_root; e; e = e->next_leaving_edge) {
+ tv = e->terminal_vertex - _vertices;
+ nb_predecessors[tv]++;
+ }
+ }
+
+ nb_without_predecessors = 0;
+ for(int k = 0; k < _nb_vertices; k++) {
+ if(nb_predecessors[k] == 0) {
+ without_predecessors[nb_without_predecessors++] = k;
+ }
+ }
+
+ scalar_t rank = 1;
+ while(nb_without_predecessors > 0) {
+ new_nb_without_predecessors = 0;
+ for(int l = 0; l < nb_without_predecessors; l++) {
+ v = _vertices + without_predecessors[l];
+ v->distance_from_source = rank;
+ for(e = v->leaving_edge_list_root; e; e = e->next_leaving_edge) {
+ tv = e->terminal_vertex - _vertices;
+ nb_predecessors[tv]--;
+ ASSERT(nb_predecessors[tv] >= 0);
+ if(nb_predecessors[tv] == 0) {
+ new_without_predecessors[new_nb_without_predecessors++] = tv;
+ }
+ }
+ }
+
+ swap(without_predecessors, new_without_predecessors);
+ nb_without_predecessors = new_nb_without_predecessors;
+ rank++;
+ }
+
+ for(int k = 0; k < _nb_vertices; k++) {
+ if(nb_predecessors[k] > 0) {
+ cerr << __FILE__ << ": The graph is not a DAG." << endl;
+ abort();
+ }
+ }
+
+ delete[] nb_predecessors;
+ delete[] without_predecessors;
+ delete[] new_without_predecessors;
+}
+
+//////////////////////////////////////////////////////////////////////
+
void MTPGraph::print(ostream *os) {
for(int k = 0; k < _nb_edges; k++) {
Edge *e = _edges + k;
- (*os) << e->origin_vertex->id
- << " -> "
- << e->terminal_vertex->id
- << " "
- << e->length;
- if(e->occupied) {
- (*os) << " *";
- }
+ (*os) << e->origin_vertex - _vertices
+ << " -> "
+ << e->terminal_vertex - _vertices
+ << " (" << e->length << ")";
+ if(e->occupied) { (*os) << " *"; }
(*os) << endl;
}
}
void MTPGraph::print_dot(ostream *os) {
(*os) << "digraph {" << endl;
- (*os) << " node[shape=circle];" << endl;
+ (*os) << " rankdir=\"LR\";" << endl;
+ (*os) << " node [shape=circle,width=0.75,fixedsize=true];" << endl;
+ (*os) << " edge [color=gray,arrowhead=open]" << 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 - _vertices
+ << " -> "
+ << e->terminal_vertex - _vertices
+ << " [";
if(e->occupied) {
- (*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) << "style=bold,color=black,";
}
+ (*os) << "label=\"" << e->length << "\"];" << endl;
}
(*os) << "}" << endl;
}
//////////////////////////////////////////////////////////////////////
-void MTPGraph::initialize_positivized_lengths_with_min() {
- scalar_t length_min = 0;
- for(int n = 0; n < _nb_vertices; n++) {
- for(Edge *e = _vertices[n].leaving_edges; e; e = e->next_leaving_edge) {
- length_min = min(e->length, length_min);
- }
- }
- for(int n = 0; n < _nb_vertices; n++) {
- for(Edge *e = _vertices[n].leaving_edges; e; e = e->next_leaving_edge) {
- e->positivized_length = e->length - length_min;
- }
- }
-}
-
void MTPGraph::update_positivized_lengths() {
for(int k = 0; k < _nb_edges; k++) {
Edge *e = _edges + k;
@@ -198,75 +312,93 @@ void MTPGraph::force_positivized_lengths() {
scalar_t residual_error = 0.0;
scalar_t max_error = 0.0;
#endif
- for(int n = 0; n < _nb_vertices; n++) {
- for(Edge *e = _vertices[n].leaving_edges; e; e = e->next_leaving_edge) {
- if(e->positivized_length < 0) {
+ for(int k = 0; k < _nb_edges; k++) {
+ Edge *e = _edges + k;
+
+ if(e->positivized_length < 0) {
#ifdef VERBOSE
- residual_error -= e->positivized_length;
- max_error = max(max_error, fabs(e->positivized_length));
+ residual_error -= e->positivized_length;
+ max_error = max(max_error, - e->positivized_length);
#endif
- e->positivized_length = 0.0;
- }
+ e->positivized_length = 0.0;
}
}
#ifdef VERBOSE
- cerr << "residual_error " << residual_error << " max_error " << residual_error << endl;
+ cerr << __FILE__ << ": residual_error " << residual_error << " max_error " << residual_error << endl;
#endif
}
-// This method does not change the edge occupation. It update
-// distance_from_source and best_pred_edge_to_source.
-void MTPGraph::find_shortest_path(Vertex **_front, Vertex **_new_front) {
- Vertex **tmp_front;
- int tmp_front_size;
+void MTPGraph::dp_compute_distances() {
Vertex *v, *tv;
Edge *e;
scalar_t d;
- for(int v = 0; v < _nb_vertices; v++) {
- _vertices[v].distance_from_source = FLT_MAX;
- _vertices[v].best_pred_edge_to_source = 0;
- _vertices[v].iteration = 0;
+ for(int k = 0; k < _nb_vertices; k++) {
+ _vertices[k].distance_from_source = FLT_MAX;
+ _vertices[k].pred_edge_toward_source = 0;
}
- int iteration = 0;
-
- int _front_size = 0, _new_front_size;
- _front[_front_size++] = _source;
_source->distance_from_source = 0;
- do {
- _new_front_size = 0;
- iteration++;
-
- for(int f = 0; f < _front_size; f++) {
- v = _front[f];
- 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 k = 0; k < _nb_vertices; k++) {
+ v = _dp_order[k];
+ for(e = v->leaving_edge_list_root; 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->pred_edge_toward_source = e;
}
}
+ }
+}
- tmp_front = _new_front;
- _new_front = _front;
- _front = tmp_front;
+// This method does not change the edge occupation. It only sets
+// properly, for every vertex, the fields distance_from_source and
+// pred_edge_toward_source.
- tmp_front_size = _new_front_size;
- _new_front_size = _front_size;
- _front_size = tmp_front_size;
- } while(_front_size > 0);
+void MTPGraph::find_shortest_path() {
+ Vertex *v, *tv, **last_slot;
+ Edge *e;
+ scalar_t d;
+
+ for(int k = 0; k < _nb_vertices; k++) {
+ _vertices[k].distance_from_source = FLT_MAX;
+ _vertices[k].pred_edge_toward_source = 0;
+ }
+
+ _heap_size = _nb_vertices;
+ _source->distance_from_source = 0;
+ _source->decrease_distance_in_heap(_heap);
+
+ do {
+ // Get the closest to the source
+ v = _heap[0];
+
+ // Remove it from the heap (swap it with the last_slot in the heap, and
+ // update the distance of that one)
+ _heap_size--;
+ last_slot = _heap + _heap_size;
+ swap(*_heap, *last_slot); swap((*_heap)->heap_slot, (*last_slot)->heap_slot);
+ _heap[0]->increase_distance_in_heap(_heap, _heap + _heap_size);
+
+ // Now update the neighbors of the node currently closest to the
+ // source
+ for(e = v->leaving_edge_list_root; e; e = e->next_leaving_edge) {
+ d = v->distance_from_source + e->positivized_length;
+ tv = e->terminal_vertex;
+ if(d < tv->distance_from_source) {
+ ASSERT(tv->heap_slot - _heap < _heap_size);
+ tv->distance_from_source = d;
+ tv->pred_edge_toward_source = e;
+ tv->decrease_distance_in_heap(_heap);
+ }
+ }
+ } while(_heap_size > 0);
}
void MTPGraph::find_best_paths(scalar_t *lengths) {
- scalar_t total_length;
+ scalar_t shortest_path_length;
Vertex *v;
Edge *e;
@@ -276,40 +408,42 @@ void MTPGraph::find_best_paths(scalar_t *lengths) {
_edges[e].positivized_length = _edges[e].length;
}
- // 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);
- update_positivized_lengths();
-
- // #warning
- // initialize_positivized_lengths_with_min();
+ // Compute the distance of all the nodes from the source by just
+ // visiting them in the proper DAG ordering we computed when
+ // building the graph
+ dp_compute_distances();
do {
- force_positivized_lengths();
- find_shortest_path(_front, _new_front);
+ // Use the current distance from the source to make all edge
+ // lengths positive
update_positivized_lengths();
+ // Fix numerical errors
+ force_positivized_lengths();
- total_length = 0.0;
+ find_shortest_path();
- // Do we reach the _sink?
- if(_sink->best_pred_edge_to_source) {
- // If yes, compute the length of the best path
+ shortest_path_length = 0.0;
+
+ // Do we reach the sink?
+ if(_sink->pred_edge_toward_source) {
+ // If yes, compute the length of the best path according to the
+ // original edge lengths
v = _sink;
- while(v->best_pred_edge_to_source) {
- total_length += v->best_pred_edge_to_source->length;
- v = v->best_pred_edge_to_source->origin_vertex;
+ while(v->pred_edge_toward_source) {
+ shortest_path_length += v->pred_edge_toward_source->length;
+ v = v->pred_edge_toward_source->origin_vertex;
}
// If that length is negative
- if(total_length < 0.0) {
+ if(shortest_path_length < 0.0) {
#ifdef VERBOSE
- cerr << "Found a path of length " << total_length << endl;
+ cerr << __FILE__ << ": Found a path of length " << shortest_path_length << endl;
#endif
// Invert all the edges along the best path
v = _sink;
- while(v->best_pred_edge_to_source) {
- e = v->best_pred_edge_to_source;
+ while(v->pred_edge_toward_source) {
+ e = v->pred_edge_toward_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;
@@ -317,64 +451,79 @@ void MTPGraph::find_best_paths(scalar_t *lengths) {
}
}
- } while(total_length < 0.0);
+ } while(shortest_path_length < 0.0);
+ // Put back the graph in its original state (i.e. invert edges which
+ // have been inverted in the process)
for(int k = 0; k < _nb_edges; k++) {
- Edge *e = _edges + k;
- if(e->occupied) { e->revert(); }
+ e = _edges + k;
+ if(e->occupied) { e->invert(); }
}
}
-int MTPGraph::retrieve_one_path(Edge *e, int *nodes) {
+int MTPGraph::retrieve_one_path(Edge *e, Path *path) {
Edge *f, *next = 0;
- int l = 0;
+ int l = 0, nb_occupied_next;
- if(nodes) { nodes[l++] = e->origin_vertex->id; }
- else l++;
+ if(path) {
+ path->nodes[l++] = e->origin_vertex - _vertices;
+ path->length = e->length;
+ } 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();
- }
+ if(path) {
+ path->nodes[l++] = e->terminal_vertex - _vertices;
+ path->length += e->length;
+ } else l++;
+
+ nb_occupied_next = 0;
+ for(f = e->terminal_vertex->leaving_edge_list_root; f; f = f->next_leaving_edge) {
+ if(f->occupied) { nb_occupied_next++; next = f; }
+ }
+
+#ifdef DEBUG
+ if(nb_occupied_next == 0) {
+ cerr << __FILE__ << ": retrieve_one_path: Non-sink end point." << endl;
+ abort();
+ }
+
+ else if(nb_occupied_next > 1) {
+ cerr << __FILE__ << ": retrieve_one_path: Non node-disjoint paths." << endl;
+ abort();
}
+#endif
+
e = next;
}
- if(nodes) { nodes[l++] = e->terminal_vertex->id; }
- else l++;
+ if(path) {
+ path->nodes[l++] = e->terminal_vertex - _vertices;
+ path->length += e->length;
+ } else l++;
return l;
}
void MTPGraph::retrieve_disjoint_paths() {
Edge *e;
+ int p, l;
for(int p = 0; p < nb_paths; p++) delete paths[p];
delete[] paths;
nb_paths = 0;
- for(e = _source->leaving_edges; e; e = e->next_leaving_edge) {
+ for(e = _source->leaving_edge_list_root; e; e = e->next_leaving_edge) {
if(e->occupied) { nb_paths++; }
}
paths = new Path *[nb_paths];
- int p = 0;
- for(e = _source->leaving_edges; e; e = e->next_leaving_edge) {
+ p = 0;
+ for(e = _source->leaving_edge_list_root; 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]->nodes);
+ retrieve_one_path(e, paths[p]);
p++;
}
}