X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mtp.cc;h=13cfad771b185167893034a0d7bfe39c44a14ec9;hb=4343b59acbf5be40580a688ccb85a9fbccd3f617;hp=529ba80f2d45c1ff48fa548835b525b7429d82a6;hpb=425acf9068dac38bccb97b12f1b423db5787e294;p=mtp.git

diff --git a/mtp.cc b/mtp.cc
index 529ba80..13cfad7 100644
--- a/mtp.cc
+++ b/mtp.cc
@@ -18,7 +18,9 @@
 
 // Multi-Tracked Path
 
-// #define VERBOSE
+// Takes the graph description file as input and produces a dot file.
+
+// EXAMPLE: ./mtp ./graph2.txt  | dot -T pdf -o- | xpdf -
 
 #include <iostream>
 #include <fstream>
@@ -29,252 +31,49 @@
 
 using namespace std;
 
-typedef float scalar_t;
-
-#ifdef DEBUG
-#define ASSERT(x) if(!(x)) { \
-  std::cerr << "ASSERT FAILED IN " << __FILE__ << ":" << __LINE__ << endl; \
-  abort(); \
-}
-#else
-#define ASSERT(x)
-#endif
-
-class Vertex;
-
-class Edge {
-public:
-  int occupied;
-  scalar_t length, work_length;
-  Vertex *terminal_vertex;
-  Edge *next, *pred;
-};
-
-class Vertex {
-public:
-  int id;
-  // These are the leaving edges
-  Edge *first_edge;
-  scalar_t distance;
-
-  Vertex *pred_vertex;
-  Edge *pred_edge;
-
-  Vertex() { first_edge = 0; }
-
-  inline void add_edge(Edge *e) {
-    if(first_edge) { first_edge->pred = e; }
-    e->next = first_edge;
-    e->pred = 0;
-    first_edge = e;
-  }
-
-  inline void del_edge(Edge *e) {
-    if(e == first_edge) { first_edge = e->next; }
-    if(e->pred) { e->pred->next = e->next; }
-    if(e->next) { e->next->pred = e->pred; }
-  }
-};
-
-class Graph {
-public:
-  int nb_vertices;
-  Edge *edge_heap;
-  Vertex *vertices;
-  Vertex *source, *sink;
-
-  Graph(int nb_vertices, int nb_edges, int *from, int *to, scalar_t *lengths,
-        int source, int sink);
-  ~Graph();
-
-  void initialize_work_lengths();
-  void update_work_length();
-  void find_shortest_path();
-  void find_best_paths();
-  void print();
-  void print_occupied_edges();
-};
-
-void Graph::print() {
-  for(int n = 0; n < nb_vertices; n++) {
-    for(Edge *e = vertices[n].first_edge; e; e = e->next) {
-      cout << n << " -> " << e->terminal_vertex->id << " " << e->length << endl;
-    }
-  }
-}
-
-void Graph::print_occupied_edges() {
-  for(int n = 0; n < nb_vertices; n++) {
-    for(Edge *e = vertices[n].first_edge; e; e = e->next) {
-      if(e->occupied) {
-        int a = n, b = e->terminal_vertex->id;
-        if(a > b) { int c = a; a = b; b = c; }
-        cout << a << " " << b << endl;
-      }
-    }
-  }
-}
-
-Graph::Graph(int nb_vrt, int nb_edges,
-             int *from, int *to, scalar_t *lengths,
-             int src, int snk) {
-  nb_vertices = nb_vrt;
-
-  edge_heap = new Edge[nb_edges];
-  vertices = new Vertex[nb_vertices];
-
-  source = &vertices[src];
-  sink = &vertices[snk];
-
-  for(int v = 0; v < nb_vertices; v++) {
-    vertices[v].id = v;
-  }
-
-  for(int e = 0; e < nb_edges; e++) {
-    vertices[from[e]].add_edge(&edge_heap[e]);
-    edge_heap[e].occupied = 0;
-    edge_heap[e].length = lengths[e];
-    edge_heap[e].terminal_vertex = &vertices[to[e]];
-  }
-}
-
-Graph::~Graph() {
-  delete[] vertices;
-  delete[] edge_heap;
-}
+#include "mtp_graph.h"
+#include "tracker.h"
 
-void Graph::initialize_work_lengths() {
-  scalar_t length_min = 0;
-  for(int n = 0; n < nb_vertices; n++) {
-    for(Edge *e = vertices[n].first_edge; e; e = e->next) {
-      length_min = min(e->length, length_min);
-    }
-  }
-  for(int n = 0; n < nb_vertices; n++) {
-    for(Edge *e = vertices[n].first_edge; e; e = e->next) {
-      e->work_length = e->length - length_min;
-    }
-  }
-}
-
-void Graph::update_work_length() {
-  for(int n = 0; n < nb_vertices; n++) {
-    scalar_t d = vertices[n].distance;
-    for(Edge *e = vertices[n].first_edge; e; e = e->next) {
-      e->work_length += d - e->terminal_vertex->distance;
-    }
-  }
-}
-
-void Graph::find_shortest_path() {
-  Vertex **front = new Vertex *[nb_vertices];
-  Vertex **new_front = new Vertex *[nb_vertices];
-  Vertex **tmp_front;
-  int tmp_front_size;
-  Vertex *v, *tv;
-  scalar_t d;
-
-#ifdef DEBUG
-  for(int n = 0; n < nb_vertices; n++) {
-    for(Edge *e = vertices[n].first_edge; e; e = e->next) {
-      if(e->work_length < 0) {
-        cerr << "DEBUG error in find_shortest_path: Edge fixed lengths have to be positive."
-             << endl;
-        abort();
-      }
-    }
-  }
-#endif
-
-  for(int v = 0; v < nb_vertices; v++) {
-    vertices[v].distance = FLT_MAX;
-    vertices[v].pred_vertex = 0;
-    vertices[v].pred_edge = 0;
-  }
-
-  int front_size = 0, new_front_size;
-  front[front_size++] = source;
-  source->distance = 0;
-
-  do {
-    new_front_size = 0;
-    for(int f = 0; f < front_size; f++) {
-      v = front[f];
-      for(Edge *e = v->first_edge; e; e = e->next) {
-        d = v->distance + e->work_length;
-        tv = e->terminal_vertex;
-        if(d < tv->distance) {
-          tv->distance = d;
-          tv->pred_vertex = v;
-          tv->pred_edge = e;
-          new_front[new_front_size++] = tv;
-        }
-      }
-    }
-
-    tmp_front = new_front;
-    new_front = front;
-    front = tmp_front;
-
-    tmp_front_size = new_front_size;
-    new_front_size = front_size;
-    front_size = tmp_front_size;
-  } while(front_size > 0);
+//////////////////////////////////////////////////////////////////////
 
-  delete[] front;
-  delete[] new_front;
+void find_best_paths(int nb_vertices,
+                     int nb_edges, int *ea, int *eb, scalar_t *el,
+                     int source, int sink,
+                     int *result_edge_occupation) {
+  MTPGraph graph(nb_vertices, nb_edges, ea, eb, source, sink);
+  graph.find_best_paths(el, result_edge_occupation);
+  graph.print_dot();
 }
 
-void Graph::find_best_paths() {
-  scalar_t total_length;
-
-  initialize_work_lengths();
-
-  do {
-#ifdef VERBOSE
-    print();
-#endif
-
-    total_length = 0.0;
-    find_shortest_path();
-    update_work_length();
-
-    // Do we reach the sink?
-    if(sink->pred_edge) {
+//////////////////////////////////////////////////////////////////////
 
-#ifdef VERBOSE
-      cout << "VERBOSE there is a path reaching the sink" << endl;
-#endif
+int main(int argc, char **argv) {
+  // int nb_locations = 6;
+  // int nb_time_steps = 5;
 
-      // If yes, compute the length of the best path
-      for(Vertex *v = sink; v->pred_edge; v = v->pred_vertex) {
-        total_length += v->pred_edge->length;
-      }
+  // {
+    // Tracker tracker(nb_time_steps, nb_locations);
 
-#ifdef VERBOSE
-      cout << "VERBOSE total_length " << total_length << endl;
-#endif
+    // for(int l = 0; l < nb_locations; l++) {
+      // for(int k = 0; k < nb_locations; k++) {
+        // tracker.set_allowed_motion(l, k, abs(l - k) <= 1);
+      // }
+    // }
 
-      // If that length is negative
-      if(total_length < 0.0) {
-        // Invert all the edges along the best path
-        for(Vertex *v = sink; v->pred_edge; v = v->pred_vertex) {
-          Edge *e = v->pred_edge;
-          e->terminal_vertex = v->pred_vertex;
-          e->occupied = 1 - e->occupied;
-          e->length = - e->length;
-          e->work_length = - e->work_length;
-          v->pred_vertex->del_edge(e);
-          v->add_edge(e);
-        }
-      }
-    }
-  } while(total_length < 0.0);
-}
+    // for(int t = 0; t < nb_time_steps; t++) {
+      // for(int l = 0; l < nb_locations; l++) {
+        // tracker.set_detection_score(t, l,
+                                    // (drand48() < 0.9 ? -1.0 : 1.0) + drand48() * 0.1 - 0.05);
+      // }
+      // tracker.set_detection_score(t, 0,
+                                  // (drand48() < 0.9 ? 1.0 : -1.0) + drand48() * 0.1 - 0.05);
+    // }
 
-//////////////////////////////////////////////////////////////////////
+    // tracker.build_graph();
+    // tracker.track();
+  // }
 
-int main(int argc, char **argv) {
+  // exit(0);
 
   if(argc < 2) {
     cerr << argv[0] << " <graph file>" << endl;
@@ -291,28 +90,29 @@ int main(int argc, char **argv) {
     (*file) >> nb_vertices >> nb_edges;
     (*file) >> source >> sink;
 
-    cout << "INPUT nb_edges " << nb_edges << endl;
-    cout << "INPUT nb_vertices " << nb_vertices << endl;
-    cout << "INPUT source " << source << endl;
-    cout << "INPUT sink " << sink << endl;
-
-    scalar_t *el = new scalar_t[nb_edges];
-    int *ea = new int[nb_edges];
-    int *eb = new int[nb_edges];
+    scalar_t *edge_lengths = new scalar_t[nb_edges];
+    int *vertex_from = new int[nb_edges];
+    int *vertex_to = new int[nb_edges];
+    int *result_edge_occupation = new int[nb_edges];
 
     for(int e = 0; e < nb_edges; e++) {
-      (*file) >> ea[e] >> eb[e] >> el[e];
-      cout << "INPUT_EDGE " << ea[e] << " " << eb[e] << " " << el[e] << endl;
+      (*file) >> vertex_from[e] >> vertex_to[e] >> edge_lengths[e];
     }
 
-    Graph graph(nb_vertices, nb_edges, ea, eb, el, source, sink);
+    find_best_paths(nb_vertices, nb_edges,
+                    vertex_from, vertex_to, edge_lengths,
+                    source, sink,
+                    result_edge_occupation);
 
-    graph.find_best_paths();
-    graph.print_occupied_edges();
+    // dot_print(nb_vertices, nb_edges,
+              // vertex_from, vertex_to, edge_lengths,
+              // source, sink,
+              // result_edge_occupation);
 
-    delete[] el;
-    delete[] ea;
-    delete[] eb;
+    delete[] result_edge_occupation;
+    delete[] edge_lengths;
+    delete[] vertex_from;
+    delete[] vertex_to;
 
   } else {