X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tracker.cc;h=e0b0903af548d6427a6966fe37f20791a867fbc7;hb=455e5736828233445ac8aea8f15b3bde7e16e9bf;hp=0a76e08670966ea7e357b623e62bbc0b6fdb6f2e;hpb=0f54e5005de0f05d4bc400f23181301eb40f469e;p=mtp.git

diff --git a/tracker.cc b/tracker.cc
index 0a76e08..e0b0903 100644
--- a/tracker.cc
+++ b/tracker.cc
@@ -18,10 +18,14 @@
 
 #include "tracker.h"
 
-Tracker::Tracker(int nb_locations, int nb_time_steps) {
+#include <iostream>
+
+using namespace std;
+
+Tracker::Tracker(int nb_time_steps, int nb_locations) {
   _nb_locations = nb_locations;
   _nb_time_steps = nb_time_steps;
-  _detection_score = allocate_array<scalar_t>(nb_locations, nb_time_steps);
+  _detection_score = allocate_array<scalar_t>(nb_time_steps, nb_locations);
   _allowed_motion = allocate_array<int>(nb_locations, nb_locations);
   for(int l = 0; l < nb_locations; l++) {
     for(int m = 0; m < nb_locations; m++) {
@@ -37,12 +41,13 @@ void Tracker::set_allowed_motion(int from_location, int to_location) {
   _allowed_motion[from_location][to_location] = 1;
 }
 
-void Tracker::set_detection_score(int location, int time, scalar_t score) {
+void Tracker::set_detection_score(int time, int location, scalar_t score) {
+  _detection_score[time][location] = score;
 }
 
 void Tracker::track() {
 
-  cout << "Building graph." << endl;
+  cerr << "Building graph." << endl;
 
   int nb_motions = 0;
   for(int l = 0; l < _nb_locations; l++) {
@@ -51,55 +56,70 @@ void Tracker::track() {
     }
   }
 
-  int nb_vertices = 2 + 2 * (_nb_time_steps + 1) * _nb_locations;
+  int nb_vertices = 2 + 2 * _nb_time_steps * _nb_locations;
   int nb_edges = _nb_locations * 2    // From source and to sink
-    + _nb_time_steps * nb_motions     // Motions
+    + (_nb_time_steps - 1) * nb_motions     // Motions
     + _nb_locations * _nb_time_steps; // Doubling of nodes to force
                                       // one target per location
 
   int source = 0, sink = nb_vertices - 1;
   int *node_from = new int[nb_edges];
   int *node_to = new int[nb_edges];
-  scalar_t *edge_length = new scalar_t[nb_edges];
+  scalar_t *edge_lengths = new scalar_t[nb_edges];
   int e = 0;
 
   for(int l = 0; l < _nb_locations; l++) {
     node_from[e] = source;
     node_to[e] = 1 + l + 0 * _nb_locations;
-    edge_length[e] = 0.0;
+    edge_lengths[e] = 0.0;
     e++;
   }
 
-  for(int t = 0; t <= _nb_time_steps; t++) {
+  for(int t = 0; t < _nb_time_steps; t++) {
     for(int l = 0; l < _nb_locations; l++) {
       node_from[e] = 1 + (2 * (t + 0) + 0) * _nb_locations + l;
       node_to[e] =   1 + (2 * (t + 0) + 1) * _nb_locations + l;
-      edge_length[e] = _detection_score[t][l];
+      edge_lengths[e] = - _detection_score[t][l];
       e++;
-      if(t == _nb_time_steps) {
-        node_from[e] = 1 + (2 * (t + 0) + 0) * _nb_locations + l;
+      if(t == _nb_time_steps - 1) {
+        node_from[e] = 1 + (2 * (t + 0) + 1) * _nb_locations + l;
         node_to[e] =   sink;
-        edge_length[e] = 0;
+        edge_lengths[e] = 0.0;
         e++;
       } else {
         for(int k = 0; k < _nb_locations; k++) {
           if(_allowed_motion[l][k]) {
             node_from[e] = 1 + (2 * (t + 0) + 1) * _nb_locations + l;
             node_to[e] =   1 + (2 * (t + 1) + 0) * _nb_locations + k;
-            edge_length[e] = 0.0;
+            edge_lengths[e] = 0.0;
             e++;
           }
         }
       }
     }
   }
+
+  cerr << "DEBUG e = " << e << " nb_edges = " << nb_edges << endl;
+
+  _graph = new MTPGraph(nb_vertices, nb_edges, node_from, node_to, source, sink);
+
+  int *edge_occupation = new int[nb_edges];
+
+  _graph->find_best_paths(edge_lengths, edge_occupation);
+
+  dot_print(nb_vertices, nb_edges, node_from, node_to, edge_lengths,
+            source, sink,
+            edge_occupation);
+
+  delete[] edge_occupation;
+  delete _graph;
 }
 
 // void Tracker::track() {
   // int e = _nb_locations;
   // for(int t = 0; t <= _nb_time_steps; t++) {
     // for(int l = 0; l < _nb_locations; l++) {
-      // edge_length[e] = _detection_score[t][l];
+      // edge_lengths[e] = _detection_score[t][l];
       // e++;
       // if(t == _nb_time_steps) {
         // e++;
@@ -110,14 +130,14 @@ void Tracker::track() {
   // }
 // }
 
-int Tracker::nb_trajectories() {
-}
+// int Tracker::nb_trajectories() {
+// }
 
-int Tracker::trajectory_start_time(int k) {
-}
+// int Tracker::trajectory_start_time(int k) {
+// }
 
-int Tracker::trajectory_end_time(int k) {
-}
+// int Tracker::trajectory_end_time(int k) {
+// }
 
-int Tracker::trajectory_location(int k, int time) {
-}
+// int Tracker::trajectory_location(int k, int time) {
+// }