X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mtp_graph.h;h=ae0003ae8db2153b2a716cc5de638b1f43cbedf9;hb=9dba69873c4b22f885a70740df7f57b0d6a37fd6;hp=17dd2228dcd8403598efe96084d57b94555e426b;hpb=8db91faf223fcb893b589c7b85d4ef5e03ffb6ce;p=mtp.git

diff --git a/mtp_graph.h b/mtp_graph.h
index 17dd222..ae0003a 100644
--- a/mtp_graph.h
+++ b/mtp_graph.h
@@ -19,25 +19,26 @@
 #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:
-  Path(int l);
-  ~Path();
-  int length;
-  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);
+  // 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;
 
@@ -49,6 +50,7 @@ class MTPGraph {
 
 public:
 
+  // These variables are filled when retrieve_disjoint_paths is called
   int nb_paths;
   Path **paths;
 
@@ -57,11 +59,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