projects
/
mtp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update, seems to work!
[mtp.git]
/
mtp_graph.cc
diff --git
a/mtp_graph.cc
b/mtp_graph.cc
index
8c79416
..
32bdfdf
100644
(file)
--- a/
mtp_graph.cc
+++ b/
mtp_graph.cc
@@
-258,7
+258,7
@@
void MTPGraph::find_shortest_path(Vertex **_front, Vertex **_new_front) {
} while(_front_size > 0);
}
} 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;
scalar_t total_length;
Vertex *v;
Edge *e;
@@
-314,11
+314,9
@@
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(); }
for(int k = 0; k < _nb_edges; k++) {
Edge *e = _edges + k;
if(e->occupied) { e->revert(); }
- result_edge_occupation[k] = e->occupied;
}
}
}
}
-
int MTPGraph::retrieve_one_path(Edge *e, int *nodes) {
Edge *f, *next;
int l = 0;
int MTPGraph::retrieve_one_path(Edge *e, int *nodes) {
Edge *f, *next;
int l = 0;
@@
-350,7
+348,7
@@
int MTPGraph::retrieve_one_path(Edge *e, int *nodes) {
return l;
}
return l;
}
-void MTPGraph::retrieve_paths() {
+void MTPGraph::retrieve_
disjoint_
paths() {
Edge *e;
for(int p = 0; p < nb_paths; p++) delete paths[p];
Edge *e;
for(int p = 0; p < nb_paths; p++) delete paths[p];
@@
-372,6
+370,4
@@
void MTPGraph::retrieve_paths() {
p++;
}
}
p++;
}
}
-
- cout << "NB_PATHS " << nb_paths << endl;
}
}