X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=mtp.git;a=blobdiff_plain;f=mtp_graph.h;h=54037e0a630890d3708bd37fdf57e3d52d5886ad;hp=bad0df5d7da59e0799e1f0693633c60ad986709b;hb=f419bacb4b11f42f87e6e9bc9e8a4719499559f2;hpb=fc369d56ff5774f00daecb744827f822472cf2ab

diff --git a/mtp_graph.h b/mtp_graph.h
index bad0df5..54037e0 100644
--- a/mtp_graph.h
+++ b/mtp_graph.h
@@ -26,7 +26,6 @@
 #define MTP_GRAPH_H
 
 #include <iostream>
-#include <cmath>
 
 using namespace std;
 
@@ -37,6 +36,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.
+  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
   // all the paths from the same initial node to the same final node
@@ -49,12 +52,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,11 +66,6 @@ class MTPGraph {
   // nodes met along the path, and computes path->length properly.
   int retrieve_one_path(Edge *e, Path *path);
 
-  // Returns if the graph is a DAG, and set the last_change field of
-  // each vertex to the maximum number of iterations required to reach
-  // it
-  int check_DAG_and_set_last_change();
-
   int _nb_vertices, _nb_edges;
   Vertex *_source, *_sink;