_source->distance_from_source = 0;
_source->decrease_distance_in_heap(_heap);
- while(heap_size > 1) {
+ while(heap_size > 1) {
// Get the closest to the source
v = _heap[0];
}
}
-int MTPGraph::retrieve_one_path(Edge *e, Path *path) {
+int MTPGraph::retrieve_one_path(Edge *e, Path *path, int *used_edges) {
Edge *f, *next = 0;
int l = 0, nb_occupied_next;
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; }
+ if(f->occupied && !used_edges[f - _edges]) {
+ nb_occupied_next++; next = f;
+ }
}
#ifdef DEBUG
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
+ if(path) { used_edges[next - _edges] = 1; }
+
e = next;
}
}
while(already_processed < front) {
+ // Here, nodes before already_processed can be ignored, nodes
+ // before front were set to 0 predecessors during the previous
+ // iteration. During this new iteration, we have to visit the
+ // successors of these ones only, since they are the only ones
+ // which may end up with no predecessors.
new_front = front;
while(already_processed < front) {
v = *(already_processed++);
void MTPGraph::retrieve_disjoint_paths() {
Edge *e;
int p, l;
+ int *used_edges;
for(int p = 0; p < nb_paths; p++) delete paths[p];
delete[] paths;
}
paths = new Path *[nb_paths];
+ used_edges = new int[_nb_edges];
+ for(int e = 0; e < _nb_edges; e++) {
+ used_edges[e] = 0;
+ }
p = 0;
for(e = _source->leaving_edge_list_root; e; e = e->next_leaving_edge) {
- if(e->occupied) {
- l = retrieve_one_path(e, 0);
+ if(e->occupied && !used_edges[e - _edges]) {
+ l = retrieve_one_path(e, 0, used_edges);
paths[p] = new Path(l);
- retrieve_one_path(e, paths[p]);
+ retrieve_one_path(e, paths[p], used_edges);
+ used_edges[e - _edges] = 1;
p++;
}
}
+
+ delete[] used_edges;
}