X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=mtp.git;a=blobdiff_plain;f=mtp_graph.h;h=9f50ae48f1f7d8d97dedc64d03bbcb96d2713e37;hp=c9105203405e26a5bff5c239fea9b34fcd46ca48;hb=c752952df0dd1d781ec80f25c4b9418bddac1b9e;hpb=14e3b33cbe1e0d7deb0b4aa697f6c8b5d43e2963 diff --git a/mtp_graph.h b/mtp_graph.h index c910520..9f50ae4 100644 --- a/mtp_graph.h +++ b/mtp_graph.h @@ -37,6 +37,10 @@ class Vertex; 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(); + // Uses the estimated vertex distances to the source to make all the // edge lengths positive, resulting in an identical added value to // all the paths from the same initial node to the same final node @@ -49,12 +53,9 @@ class MTPGraph { // the total correction when compiled in VERBOSE mode. void force_positivized_lengths(); - void decrease_distance_in_heap(Vertex *v); - void increase_distance_in_heap(Vertex *v); - - // Visit the vertices according to _dp_order and simply update their - // distance to the source - void dp_distance_propagation(); + // Visit the vertices according to _dp_order and update their + // distance from the source + void dp_compute_distances(); // Set in every vertex pred_edge_toward_source correspondingly to // the path of shortest length. The current implementation is @@ -66,10 +67,6 @@ class MTPGraph { // nodes met along the path, and computes path->length properly. int retrieve_one_path(Edge *e, Path *path); - // 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_distances(); - int _nb_vertices, _nb_edges; Vertex *_source, *_sink;