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

diff --git a/mtp_graph.h b/mtp_graph.h
index bdf8674..2bc5933 100644
--- a/mtp_graph.h
+++ b/mtp_graph.h
@@ -49,8 +49,16 @@ class MTPGraph {
   // the total correction when compiled in VERBOSE mode.
   void force_positivized_lengths();
 
-  // Set the edge pred_edge_toward_source correspondingly to the path
-  // of shortest length. The current implementation is not Dijkstra's!
+  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();
+
+  // Set in every vertex pred_edge_toward_source correspondingly to
+  // the path of shortest length. The current implementation is
+  // Dijkstra with a Binary Heap (and not with Fibonnaci heap (yet))
   void find_shortest_path();
 
   // Follows the path starting on edge e and returns the number of
@@ -58,10 +66,10 @@ 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
-  int is_dag();
-
-  Vertex **_front, **_new_front;
+  // 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;
@@ -69,6 +77,13 @@ class MTPGraph {
   Edge *_edges;
   Vertex *_vertices;
 
+  // For the shortest path search
+
+  Vertex **_heap;
+  int _heap_size;
+
+  Vertex **_dp_order;
+
 public:
 
   // These variables are filled when retrieve_disjoint_paths is called