X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=mtp.git;a=blobdiff_plain;f=mtp_graph.h;h=33a29f51b690bc510bff5a46343ff5a22950d2bc;hp=84c9ce60bf1a447e7cc7ce69dd6415369bee8b2d;hb=2228dec6631697204466df7e45b7ab3786f6308a;hpb=8439be2cf9581730b6a83425451cb9a335b2c715

diff --git a/mtp_graph.h b/mtp_graph.h
index 84c9ce6..33a29f5 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,11 +49,8 @@ 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
+  // 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
@@ -66,10 +63,6 @@ class MTPGraph {
   // nodes met along the path, and computes path->length properly.
   int retrieve_one_path(Edge *e, Path *path);
 
-  // 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;
 
@@ -78,12 +71,13 @@ class MTPGraph {
 
   // 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