X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mtp_graph.h;h=1bfbe0cc2d854be916efa00bbd09601dd1b29885;hb=ecead8ae3e8f3fdc43f6f8b2d7327e253cdae637;hp=2bc59336cad9bb7cf1aa25e063ebfef6fb6889d3;hpb=7f847d18f82e92c8af842f50e0ea16fa66bf9584;p=mtp.git

diff --git a/mtp_graph.h b/mtp_graph.h
index 2bc5933..1bfbe0c 100644
--- 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();
+  // 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 +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;
@@ -77,11 +73,12 @@ class MTPGraph {
   Edge *_edges;
   Vertex *_vertices;
 
-  // For the shortest path search
-
+  // For Dijkstra
   Vertex **_heap;
   int _heap_size;
 
+  // Updating the distances from the source in that order will work in
+  // the original graph (which has to be a DAG)
   Vertex **_dp_order;
 
 public:
@@ -95,11 +92,11 @@ public:
 
   ~MTPGraph();
 
-  // Compute the family of path with minimum total length, set the
+  // Compute the family of paths with minimum total length, set the
   // edge occupied fields accordingly.
   void find_best_paths(scalar_t *lengths);
 
-  // Retrieve the path corresponding to the occupied edges, and save
+  // Retrieve the paths corresponding to the occupied edges, and save
   // the result in the nb_paths and paths fields.
   void retrieve_disjoint_paths();