X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=tracker.cc;h=f5dffd88e521373036cd147060d6bf3353ccc6ac;hb=7704ecb19140055b21e1012cd0d394f2a6db98eb;hp=0e6ed6a4de53b86414da5e5208e473842b3005a0;hpb=924a2d8b5313d1bbe84515fc262db3c7e7d50355;p=mtp.git

diff --git a/tracker.cc b/tracker.cc
index 0e6ed6a..f5dffd8 100644
--- a/tracker.cc
+++ b/tracker.cc
@@ -26,23 +26,23 @@ 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);
+  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];
+  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;
+      detection_score[t][l] = 0.0;
     }
   }
 
@@ -53,65 +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) {
-  ASSERT(from_location >= 0 && from_location < _nb_locations &&
-         to_location >= 0 && to_location < _nb_locations);
-  _allowed_motion[from_location][to_location] = v;
-}
-
-void Tracker::set_as_entrance(int location, int v) {
-  ASSERT(location >= 0 && location < _nb_locations);
-  _entrances[location] = v;
-}
-
-void Tracker::set_as_exit(int location, int v) {
-  ASSERT(location >= 0 && location < _nb_locations);
-  _exits[location] = v;
-}
-
-void Tracker::set_detection_score(int time, int location, scalar_t score) {
-  ASSERT(time >= 0 && time < _nb_time_steps &&
-         location >= 0 && location < _nb_locations);
-  _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++) {
@@ -137,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;
@@ -148,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;
@@ -173,11 +162,11 @@ 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];
+      _edge_lengths[e++] = - detection_score[t][l];
     }
   }
   _graph->print_dot(os);
@@ -187,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];
     }
   }