X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=tracker.cc;h=5a0647b682a73630744b0247204056d678e39bca;hb=6afe91234d7807ce82b96a071087decb2f7aead3;hp=ad68c28855c0db77d2487fc26df0ec64d01341e8;hpb=e9fbecf1c13c63a717c1b359c24287dbce23d4ed;p=mtp.git

diff --git a/tracker.cc b/tracker.cc
index ad68c28..5a0647b 100644
--- a/tracker.cc
+++ b/tracker.cc
@@ -25,16 +25,24 @@ 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_time_steps, _nb_locations);
-  _allowed_motion = allocate_array<int>(_nb_locations, _nb_locations);
-  _entrances = new int[_nb_locations];
-  _exits = new int[_nb_locations];
+
+  detection_score = allocate_array<scalar_t>(_nb_time_steps, _nb_locations);
+  allowed_motion = allocate_array<int>(_nb_locations, _nb_locations);
+
+  entrances = new int[_nb_locations];
+  exits = new int[_nb_locations];
 
   for(int l = 0; l < nb_locations; l++) {
-    _entrances[l] = 0;
-    _exits[l] = 0;
+    entrances[l] = 0;
+    exits[l] = 0;
     for(int m = 0; m < nb_locations; m++) {
-      _allowed_motion[l][m] = 0;
+      allowed_motion[l][m] = 0;
+    }
+  }
+
+  for(int t = 0; t < _nb_time_steps; t++) {
+    for(int l = 0; l < _nb_locations; l++) {
+      detection_score[t][l] = 0.0;
     }
   }
 
@@ -45,59 +53,54 @@ Tracker::Tracker(int nb_time_steps, int nb_locations) {
 Tracker::~Tracker() {
   delete[] _edge_lengths;
   delete _graph;
-  deallocate_array<scalar_t>(_detection_score);
-  deallocate_array<int>(_allowed_motion);
-  delete[] _exits;
-  delete[] _entrances;
-}
-
-void Tracker::set_allowed_motion(int from_location, int to_location, int v) {
-  _allowed_motion[from_location][to_location] = v;
-}
-
-void Tracker::set_as_entrance(int location, int v) {
-  _entrances[location] = v;
-}
-
-void Tracker::set_as_exit(int location, int v) {
-  _exits[location] = v;
-}
-
-void Tracker::set_detection_score(int time, int location, scalar_t score) {
-  _detection_score[time][location] = score;
+  deallocate_array<scalar_t>(detection_score);
+  deallocate_array<int>(allowed_motion);
+  delete[] exits;
+  delete[] entrances;
 }
 
 void Tracker::build_graph() {
-  // Delete existing graph
+  // Delete existing graph if there was one
   delete[] _edge_lengths;
   delete _graph;
 
   int nb_motions = 0, nb_exits = 0, nb_entrances = 0;
+
   for(int l = 0; l < _nb_locations; l++) {
-    if(_exits[l]) nb_exits++;
-    if(_entrances[l]) nb_entrances++;
+    if(exits[l]) nb_exits++;
+    if(entrances[l]) nb_entrances++;
     for(int m = 0; m < _nb_locations; m++) {
-      if(_allowed_motion[l][m]) nb_motions++;
+      if(allowed_motion[l][m]) nb_motions++;
     }
   }
 
   int nb_vertices = 2 + 2 * _nb_time_steps * _nb_locations;
 
   int nb_edges =
+    // The edges from the source to the first frame, and from the last
+    // frame to the sink
     _nb_locations * 2 +
-    (_nb_time_steps - 2) * (nb_exits + nb_entrances) +
+    // The edges from the source to the entrances and from the exists
+    // to the sink (in every time frames but the first for the source,
+    // and last for the exits)
+    (_nb_time_steps - 1) * (nb_exits + nb_entrances) +
+    // The edges for the motions, between every pair of successive
+    // frames
     (_nb_time_steps - 1) * nb_motions +
+    // The edges inside the duplicated nodes
     _nb_locations * _nb_time_steps;
 
-  int source = 0, sink = nb_vertices - 1;
   int *node_from = new int[nb_edges];
   int *node_to = new int[nb_edges];
+
+  int source = 0, sink = nb_vertices - 1;
   int e = 0;
 
   _edge_lengths = new scalar_t[nb_edges];
 
   // We put the in-node edges first, since these are the ones whose
-  // lengths we will have to change according to the detection score
+  // lengths we will have to set later, according to the detection
+  // scores
 
   for(int t = 0; t < _nb_time_steps; t++) {
     for(int l = 0; l < _nb_locations; l++) {
@@ -107,7 +110,6 @@ void Tracker::build_graph() {
     }
   }
 
-  // We put the other edges after
   for(int l = 0; l < _nb_locations; l++) {
     node_from[e] = source;
     node_to[e] = 1 + l + 0 * _nb_locations;
@@ -124,7 +126,7 @@ void Tracker::build_graph() {
         e++;
       } else {
         for(int k = 0; k < _nb_locations; k++) {
-          if(_allowed_motion[l][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_lengths[e] = 0.0;
@@ -135,15 +137,15 @@ void Tracker::build_graph() {
     }
   }
 
-  for(int t = 1; t < _nb_time_steps-1; t++) {
+  for(int t = 0; t < _nb_time_steps; t++) {
     for(int l = 0; l < _nb_locations; l++) {
-      if(_entrances[l]) {
+      if(t > 0 && entrances[l]) {
         node_from[e] = source;
         node_to[e] =   1 + (2 * (t + 0) + 0) * _nb_locations + l;
         _edge_lengths[e] = 0.0;
         e++;
       }
-      if(_exits[l]) {
+      if(t < _nb_time_steps - 1 && exits[l]) {
         node_from[e] =   1 + (2 * (t + 0) + 1) * _nb_locations + l;
         node_to[e] = sink;
         _edge_lengths[e] = 0.0;
@@ -160,7 +162,13 @@ void Tracker::build_graph() {
   delete[] node_to;
 }
 
-void Tracker::print_dot_graph(ostream *os) {
+void Tracker::print_graph_dot(ostream *os) {
+  int e = 0;
+  for(int t = 0; t < _nb_time_steps; t++) {
+    for(int l = 0; l < _nb_locations; l++) {
+      _edge_lengths[e++] = - detection_score[t][l];
+    }
+  }
   _graph->print_dot(os);
 }
 
@@ -168,7 +176,7 @@ void Tracker::track() {
   int e = 0;
   for(int t = 0; t < _nb_time_steps; t++) {
     for(int l = 0; l < _nb_locations; l++) {
-      _edge_lengths[e++] = - _detection_score[t][l];
+      _edge_lengths[e++] = - detection_score[t][l];
     }
   }
 
@@ -178,8 +186,8 @@ void Tracker::track() {
 #ifdef VERBOSE
   for(int p = 0; p < _graph->nb_paths; p++) {
     Path *path = _graph->paths[p];
-    cout << "PATH " << p << " [length " << path->length << "] " << path->nodes[0];
-    for(int n = 1; n < path->length; n++) {
+    cout << "PATH " << p << " [length " << path->nb_nodes << "] " << path->nodes[0];
+    for(int n = 1; n < path->nb_nodes; n++) {
       cout << " -> " << path->nodes[n];
     }
     cout << endl;
@@ -191,8 +199,16 @@ int Tracker::nb_trajectories() {
   return _graph->nb_paths;
 }
 
+scalar_t Tracker::trajectory_score(int k) {
+  return -_graph->paths[k]->length;
+}
+
+int Tracker::trajectory_entrance_time(int k) {
+  return (_graph->paths[k]->nodes[1] - 1) / (2 * _nb_locations);
+}
+
 int Tracker::trajectory_duration(int k) {
-  return (_graph->paths[k]->length - 2) / 2;
+  return (_graph->paths[k]->nb_nodes - 2) / 2;
 }
 
 int Tracker::trajectory_location(int k, int time) {