X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=inline;f=mtp_graph.cc;h=32bdfdfe69dfe292db6d63749947e0eed09488c1;hb=8946d0df4263aa20a670cedd5d61f9709b858fca;hp=8c79416de072436ebd17ad2b0d526e16c3180111;hpb=8db91faf223fcb893b589c7b85d4ef5e03ffb6ce;p=mtp.git diff --git a/mtp_graph.cc b/mtp_graph.cc index 8c79416..32bdfdf 100644 --- 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); } -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; @@ -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(); } - result_edge_occupation[k] = e->occupied; } } - 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; } -void MTPGraph::retrieve_paths() { +void MTPGraph::retrieve_disjoint_paths() { Edge *e; for(int p = 0; p < nb_paths; p++) delete paths[p]; @@ -372,6 +370,4 @@ void MTPGraph::retrieve_paths() { p++; } } - - cout << "NB_PATHS " << nb_paths << endl; }