Update.

[mtp.git] / mtp_graph.h

diff --git a/mtp_graph.h b/mtp_graph.h
index 5feb20f..7ccbfe3 100644 (file)
--- a/mtp_graph.h
+++ b/mtp_graph.h
@@ -19,19 +19,17 @@
 #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();
@@ -49,6 +47,7 @@ class MTPGraph {
 
 public:
 
+  // These variables are filled when retrieve_disjoint_paths is called
   int nb_paths;
   Path **paths;
 
@@ -60,8 +59,8 @@ public:
   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