From: Francois Fleuret Date: Sun, 23 Dec 2012 13:08:11 +0000 (+0100) Subject: Cosmetics. X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=commitdiff_plain;h=740285a747ef0eaf4eefc26935932e1679ab1964;p=mtp.git Cosmetics. --- diff --git a/mtp_graph.cc b/mtp_graph.cc index 682dd80..dc38321 100644 --- a/mtp_graph.cc +++ b/mtp_graph.cc @@ -24,6 +24,7 @@ #include "mtp_graph.h" +#include #include using namespace std; @@ -43,9 +44,10 @@ public: class Vertex { public: - Edge *leaving_edges; scalar_t distance_from_source; Edge *pred_edge_toward_source; + + Edge *leaving_edge_list_root; Vertex **heap_slot; Vertex(); @@ -69,19 +71,21 @@ void Edge::invert() { ////////////////////////////////////////////////////////////////////// Vertex::Vertex() { - leaving_edges = 0; + leaving_edge_list_root = 0; } void Vertex::add_leaving_edge(Edge *e) { - e->next_leaving_edge = leaving_edges; + 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_leaving_edge(Edge *e) { - if(e == leaving_edges) { - leaving_edges = e->next_leaving_edge; + 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; @@ -129,7 +133,7 @@ void Vertex::increase_distance_in_heap(Vertex **heap, Vertex **heap_bottom) { ////////////////////////////////////////////////////////////////////// -static int compare_vertex(const void *v1, const void *v2) { +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; @@ -138,6 +142,8 @@ static int compare_vertex(const void *v1, const void *v2) { else return 0; } +////////////////////////////////////////////////////////////////////// + MTPGraph::MTPGraph(int nb_vertices, int nb_edges, int *vertex_from, int *vertex_to, int source, int sink) { @@ -167,16 +173,9 @@ MTPGraph::MTPGraph(int nb_vertices, int nb_edges, paths = 0; nb_paths = 0; - if(compute_dp_ranks()) { - // Here the distance_from_source field of every vertex is the - // number of DP iterations needed to update it. Hence we only have - // to process the vertex in that order. - for(int v = 0; v < _nb_vertices; v++) { _dp_order[v] = &_vertices[v]; } - qsort(_dp_order, _nb_vertices, sizeof(Vertex *), compare_vertex); - } else { - cerr << __FILE__ << ": This graph is not a DAG." << endl; - abort(); - } + 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() { @@ -188,7 +187,9 @@ MTPGraph::~MTPGraph() { delete[] paths; } -int MTPGraph::compute_dp_ranks() { +////////////////////////////////////////////////////////////////////// + +void MTPGraph::compute_dp_ranks() { Vertex *v; Edge *e; @@ -218,7 +219,7 @@ int MTPGraph::compute_dp_ranks() { // edges to the current rank value for(int f = 0; f < nb_with_predecessor; f++) { v = with_predecessor[f]; - for(e = v->leaving_edges; e; e = e->next_leaving_edge) { + for(e = v->leaving_edge_list_root; e; e = e->next_leaving_edge) { e->terminal_vertex->distance_from_source = rank; } } @@ -239,7 +240,10 @@ int MTPGraph::compute_dp_ranks() { delete[] with_predecessor; - return nb_with_predecessor == 0; + if(nb_with_predecessor > 0) { + cerr << __FILE__ << ": The graph is not a DAG." << endl; + abort(); + } } ////////////////////////////////////////////////////////////////////// @@ -248,13 +252,10 @@ void MTPGraph::print(ostream *os) { for(int k = 0; k < _nb_edges; k++) { Edge *e = _edges + k; (*os) << e->origin_vertex - _vertices - << " -> " - << e->terminal_vertex - _vertices - << " " - << e->length; - if(e->occupied) { - (*os) << " *"; - } + << " -> " + << e->terminal_vertex - _vertices + << " (" << e->length << ")"; + if(e->occupied) { (*os) << " *"; } (*os) << endl; } } @@ -326,7 +327,7 @@ void MTPGraph::dp_compute_distances() { for(int k = 0; k < _nb_vertices; k++) { v = _dp_order[k]; - for(e = v->leaving_edges; e; e = e->next_leaving_edge) { + 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) { @@ -368,7 +369,7 @@ void MTPGraph::find_shortest_path() { // Now update the neighbors of the node currently closest to the // source - for(e = v->leaving_edges; e; e = e->next_leaving_edge) { + 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) { @@ -461,7 +462,7 @@ int MTPGraph::retrieve_one_path(Edge *e, Path *path) { } else l++; nb_occupied_next = 0; - for(f = e->terminal_vertex->leaving_edges; f; f = f->next_leaving_edge) { + for(f = e->terminal_vertex->leaving_edge_list_root; f; f = f->next_leaving_edge) { if(f->occupied) { nb_occupied_next++; next = f; } } @@ -496,14 +497,14 @@ void MTPGraph::retrieve_disjoint_paths() { 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]; p = 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) { l = retrieve_one_path(e, 0); paths[p] = new Path(l); diff --git a/mtp_graph.h b/mtp_graph.h index 9f50ae4..54037e0 100644 --- a/mtp_graph.h +++ b/mtp_graph.h @@ -26,7 +26,6 @@ #define MTP_GRAPH_H #include -#include using namespace std; @@ -39,7 +38,7 @@ class Edge; class MTPGraph { // Set the distance_from_source fields to the number of DP // iterations needed to update it. Abort if the graph is not a DAG. - int compute_dp_ranks(); + void compute_dp_ranks(); // Uses the estimated vertex distances to the source to make all the // edge lengths positive, resulting in an identical added value to