X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mtp_graph.h;h=7ccbfe36ff1982a73c5d88be900b0756f99c62d9;hb=15ad4100d5f4d7e3e15ea807c9bef8002fa9c177;hp=7b0f57d6c3e0395afbb6d368181452271681b896;hpb=8df7c7e77366cb95e9e8e963af9319d9cbac1934;p=mtp.git

diff --git a/mtp_graph.h b/mtp_graph.h
index 7b0f57d..7ccbfe3 100644
--- a/mtp_graph.h
+++ b/mtp_graph.h
@@ -19,16 +19,23 @@
 #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_with_min();
-  void update_work_lengths();
-  void force_positive_work_lengths();
+  void initialize_positivized_lengths_with_min();
+  void update_positivized_lengths();
+  void force_positivized_lengths();
   void find_shortest_path(Vertex **front, Vertex **new_front);
+  int retrieve_one_path(Edge *e, int *nodes);
 
   Vertex **_front, **_new_front;
 
@@ -40,14 +47,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