X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=mtp.git;a=blobdiff_plain;f=mtp_graph.h;h=64308b9c000d6e45de0372080fb504ea39880436;hp=883a67ff147c69d62763a790d28fbc861a003555;hb=HEAD;hpb=276df8ea8b9761cc729048d8e5c42670debc5825

diff --git a/mtp_graph.h b/mtp_graph.h
index 883a67f..64308b9 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,7 +49,7 @@ class MTPGraph {
   // the total correction when compiled in VERBOSE mode.
   void force_positivized_lengths();
 
-  // Visit the vertices according to _dp_order and simply update their
+  // Visit the vertices according to _dp_order and update their
   // distance from the source
   void dp_compute_distances();
 
@@ -61,11 +61,7 @@ class MTPGraph {
   // Follows the path starting on edge e and returns the number of
   // nodes to reach the sink. If path is non-null, stores in it the
   // 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_ranks();
+  int retrieve_one_path(Edge *e, Path *path, int *used_edges);
 
   int _nb_vertices, _nb_edges;
   Vertex *_source, *_sink;
@@ -75,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
@@ -97,7 +94,10 @@ public:
   void find_best_paths(scalar_t *lengths);
 
   // Retrieve the paths corresponding to the occupied edges, and save
-  // the result in the nb_paths and paths fields.
+  // the result in the nb_paths and paths fields. If the paths are not
+  // node-disjoint, there are multiple families of paths that
+  // "explain" the edge occupancies, and this method picks one of them
+  // arbitrarily.
   void retrieve_disjoint_paths();
 
   void print(ostream *os);