X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mtp_graph.h;h=7ccbfe36ff1982a73c5d88be900b0756f99c62d9;hb=535b8ede7d6646ea17135da10c8a16416524f6e9;hp=e46568895a1dbec8b707932ef3bff3a1b1750803;hpb=340972b07aa40e812a99ecd2bced570cdd5eed84;p=mtp.git

diff --git a/mtp_graph.h b/mtp_graph.h
index e465688..7ccbfe3 100644
--- a/mtp_graph.h
+++ b/mtp_graph.h
@@ -19,23 +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 Path {
-public:
-  int starting_time;
-  int duration;
-  int *nodes;
-};
-
 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);
+  int retrieve_one_path(Edge *e, int *nodes);
 
   Vertex **_front, **_new_front;
 
@@ -47,6 +47,7 @@ class MTPGraph {
 
 public:
 
+  // These variables are filled when retrieve_disjoint_paths is called
   int nb_paths;
   Path **paths;
 
@@ -55,11 +56,11 @@ public:
 
   ~MTPGraph();
 
-  void find_best_paths(scalar_t *lengths, int *result_edge_occupation);
-  void retrieve_paths();
+  void find_best_paths(scalar_t *lengths);
+  void retrieve_disjoint_paths();
 
-  void print();
-  void print_dot();
+  void print(ostream *os);
+  void print_dot(ostream *os);
 };
 
 #endif