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

diff --git a/mtp_graph.h b/mtp_graph.h
index 9c14ea2..f12262e 100644
--- a/mtp_graph.h
+++ b/mtp_graph.h
@@ -26,14 +26,17 @@ class Edge;
 
 class MTPGraph {
   void initialize_work_lengths();
-  void update_work_length();
+  void update_work_lengths();
+  void force_positive_work_lengths();
   void find_shortest_path(Vertex **front, Vertex **new_front);
 
   int _nb_vertices, _nb_edges;
-  Edge *edge_heap;
-  Vertex *vertices;
-  Vertex *source, *sink;
+  Vertex *_source, *_sink;
+  Vertex **_front, **_new_front;
 public:
+  Edge *edges;
+  Vertex *vertices;
+
   MTPGraph(int nb_vertices, int nb_edges, int *from, int *to,
            int source, int sink);
 
@@ -41,11 +44,7 @@ public:
 
   void find_best_paths(scalar_t *lengths, int *result_edge_occupation);
   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