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

diff --git a/mtp_graph.h b/mtp_graph.h
index 2bc5933..e0f40e9 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,7 @@ class Vertex;
 class Edge;
 
 class MTPGraph {
+
   // 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 +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();
+  // 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,24 +63,22 @@ 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;
 
   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;
 
+  // Fills _dp_order
+  void compute_dp_ordering();
 public:
 
   // These variables are filled when retrieve_disjoint_paths is called
@@ -95,11 +90,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();