Moved the heap-related methods in the Vertex class, made them inline.

[mtp.git] / mtp_graph.h

diff --git a/mtp_graph.h b/mtp_graph.h
index bad0df5..ff15830 100644 (file)
--- a/mtp_graph.h
+++ b/mtp_graph.h
@@ -49,12 +49,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();
+  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 +63,9 @@ 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();
+  // 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;