X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mtp_graph.h;h=ddf71622bec878921029f66509c60fb0261e1925;hb=fda29b3422f4850d77e4b8f4916251509789d3ac;hp=f12262e776f3119b874c874b2c067ac20bbdc6a0;hpb=b33d04fc473e7de0f9d404b014fb694b7ee6c661;p=mtp.git

diff --git a/mtp_graph.h b/mtp_graph.h
index f12262e..ddf7162 100644
--- a/mtp_graph.h
+++ b/mtp_graph.h
@@ -19,32 +19,53 @@
 #ifndef MTP_GRAPH_H
 #define MTP_GRAPH_H
 
+#include <iostream>
+
+using namespace std;
+
 #include "misc.h"
 
 class Vertex;
 class Edge;
 
+class Path {
+public:
+  Path(int l);
+  ~Path();
+  int length;
+  int *nodes;
+};
+
 class MTPGraph {
-  void initialize_work_lengths();
-  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;
 
   int _nb_vertices, _nb_edges;
   Vertex *_source, *_sink;
-  Vertex **_front, **_new_front;
+
+  Edge *_edges;
+  Vertex *_vertices;
+
 public:
-  Edge *edges;
-  Vertex *vertices;
+
+  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