X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mtp.cc;h=06247e6f1e6ac8c4759f9a0bbb90612851395bba;hb=8946d0df4263aa20a670cedd5d61f9709b858fca;hp=13cfad771b185167893034a0d7bfe39c44a14ec9;hpb=f72214033cc9a12fb40470a5122f3c4686cdc2d1;p=mtp.git

diff --git a/mtp.cc b/mtp.cc
index 13cfad7..06247e6 100644
--- a/mtp.cc
+++ b/mtp.cc
@@ -41,88 +41,46 @@ void find_best_paths(int nb_vertices,
                      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.find_best_paths(el);
   graph.print_dot();
 }
 
 //////////////////////////////////////////////////////////////////////
 
 int main(int argc, char **argv) {
-  // int nb_locations = 6;
-  // int nb_time_steps = 5;
-
-  // {
-    // Tracker tracker(nb_time_steps, nb_locations);
-
-    // 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);
-      // }
-    // }
-
-    // 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();
-  // }
-
-  // exit(0);
-
-  if(argc < 2) {
-    cerr << argv[0] << " <graph file>" << endl;
-    exit(EXIT_FAILURE);
-  }
-
-  ifstream *file = new ifstream(argv[1]);
-
-  int nb_edges, nb_vertices;
-  int source, sink;
+  int nb_locations = 6;
+  int nb_time_steps = 10;
 
-  if(file->good()) {
+  Tracker tracker(nb_time_steps, nb_locations);
 
-    (*file) >> nb_vertices >> nb_edges;
-    (*file) >> source >> sink;
-
-    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) >> vertex_from[e] >> vertex_to[e] >> edge_lengths[e];
+  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);
     }
+  }
 
-    find_best_paths(nb_vertices, nb_edges,
-                    vertex_from, vertex_to, edge_lengths,
-                    source, sink,
-                    result_edge_occupation);
-
-    // dot_print(nb_vertices, nb_edges,
-              // vertex_from, vertex_to, edge_lengths,
-              // source, sink,
-              // result_edge_occupation);
-
-    delete[] result_edge_occupation;
-    delete[] edge_lengths;
-    delete[] vertex_from;
-    delete[] vertex_to;
-
-  } else {
-
-    cerr << "Can not open " << argv[1] << endl;
+  for(int r = 0; r < 10; r++) {
+    cout << "* ROUND " << r << endl;
+    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);
+    }
 
-    delete file;
-    exit(EXIT_FAILURE);
+    tracker.build_graph();
+    tracker.track();
 
+    for(int t = 0; t < tracker.nb_trajectories(); t++) {
+      cout << "TRAJECTORY " << t << " :";
+      for(int u = 0; u < tracker.trajectory_duration(t); u++) {
+        cout << " " << tracker.trajectory_location(t, u);
+      }
+      cout << endl;
+    }
   }
 
-  delete file;
   exit(EXIT_SUCCESS);
 }