X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mtp_graph.h;h=ae0003ae8db2153b2a716cc5de638b1f43cbedf9;hb=4d9b58034ce82094c233b61da247e11a584ec0bd;hp=699ee16bbd2439c2970673d45a37995244bbfffa;hpb=ea33e3e5dddbe3796d2361910e1e3ed98a19865c;p=mtp.git

diff --git a/mtp_graph.h b/mtp_graph.h
index 699ee16..ae0003a 100644
--- a/mtp_graph.h
+++ b/mtp_graph.h
@@ -19,31 +19,51 @@
 #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_work_lengths();
-  void update_work_length();
-  void find_shortest_path(Vertex **front, Vertex **new_front);
+  void update_positivized_lengths();
+  void force_positivized_lengths();
+  // 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;
 
   int _nb_vertices, _nb_edges;
   Vertex *_source, *_sink;
-  Vertex **_front, **_new_front;
+
+  Edge *_edges;
+  Vertex *_vertices;
+
 public:
-  Edge *edges;
-  Vertex *vertices;
+
+  // 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