The main command now loads a tracker file, and mtp_example produces it.

[mtp.git] / mtp_graph.h

diff --git a/mtp_graph.h b/mtp_graph.h
index e465688..ae0003a 100644 (file)
--- a/mtp_graph.h
+++ b/mtp_graph.h
@@ -19,23 +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:
-  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);
+  // 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;
 
@@ -47,6 +50,7 @@ class MTPGraph {
 
 public:
 
+  // These variables are filled when retrieve_disjoint_paths is called
   int nb_paths;
   Path **paths;
 
@@ -55,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