X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mtp_graph.h;h=ae0003ae8db2153b2a716cc5de638b1f43cbedf9;hb=24d311902f1367ea7de57ce8f737c12934234577;hp=f2bedd47a2a7f919ffe08483b6d966ce0fa6bcf1;hpb=79a4a9ab164a667ecb551078e1cd773e2140e3c2;p=mtp.git

diff --git a/mtp_graph.h b/mtp_graph.h
index f2bedd4..ae0003a 100644
--- a/mtp_graph.h
+++ b/mtp_graph.h
@@ -19,16 +19,26 @@
 #ifndef MTP_GRAPH_H
 #define MTP_GRAPH_H
 
+#include <iostream>
+#include <cmath>
+
+using namespace std;
+
 #include "misc.h"
+#include "path.h"
 
 class Vertex;
 class Edge;
 
 class MTPGraph {
-  void initialize_positivized_lengths_with_min();
   void update_positivized_lengths();
   void force_positivized_lengths();
-  void find_shortest_path(Vertex **front, Vertex **new_front);
+  // Set the edge pred_edge_toward_source correspondingly to the path
+  // of shortest length.
+  void find_shortest_path();
+  // Follows the path starting on edge e and returns its length. If
+  // nodes is non-null, stores in it the nodes met along the path.
+  int retrieve_one_path(Edge *e, Path *path);
 
   Vertex **_front, **_new_front;
 
@@ -40,14 +50,20 @@ class MTPGraph {
 
 public:
 
+  // These variables are filled when retrieve_disjoint_paths is called
+  int nb_paths;
+  Path **paths;
+
   MTPGraph(int nb_vertices, int nb_edges, int *from, int *to,
            int source, int sink);
 
   ~MTPGraph();
 
-  void find_best_paths(scalar_t *lengths, int *result_edge_occupation);
-  void print();
-  void print_dot();
+  void find_best_paths(scalar_t *lengths);
+  void retrieve_disjoint_paths();
+
+  void print(ostream *os);
+  void print_dot(ostream *os);
 };
 
 #endif