X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mtp_graph.h;h=5feb20f33d4082e156a0af0346f797e4d776f56a;hb=5b85b5488da0952f823b2c2cfd3793669fc3ac95;hp=9c14ea2770f47900252a31c2104749c61323d05a;hpb=455e5736828233445ac8aea8f15b3bde7e16e9bf;p=mtp.git

diff --git a/mtp_graph.h b/mtp_graph.h
index 9c14ea2..5feb20f 100644
--- a/mtp_graph.h
+++ b/mtp_graph.h
@@ -24,28 +24,44 @@
 class Vertex;
 class Edge;
 
+class Path {
+public:
+  Path(int l);
+  ~Path();
+  int length;
+  int *nodes;
+};
+
 class MTPGraph {
-  void initialize_work_lengths();
-  void update_work_length();
+  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;
-  Edge *edge_heap;
-  Vertex *vertices;
-  Vertex *source, *sink;
+  Vertex *_source, *_sink;
+
+  Edge *_edges;
+  Vertex *_vertices;
+
 public:
+
+  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 find_best_paths(scalar_t *lengths);
+  void retrieve_disjoint_paths();
+
   void print();
+  void print_dot();
 };
 
-void dot_print(int nb_vertices,
-               int nb_edges, int *ea, int *eb, scalar_t *el,
-               int source, int sink,
-               int *edge_occupation);
-
 #endif