Properly puts the edge occupancy back to 0 when starting tracking.

[mtp.git] / tracker.cc

diff --git a/tracker.cc b/tracker.cc
index b67ddfb..3a311cd 100644 (file)
--- a/tracker.cc
+++ b/tracker.cc
@@ -25,9 +25,14 @@ 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);
+  _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;
     for(int m = 0; m < nb_locations; m++) {
       _allowed_motion[l][m] = 0;
     }
@@ -42,12 +47,22 @@ Tracker::~Tracker() {
   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;
 }
@@ -58,17 +73,22 @@ void Tracker::build_graph() {
   delete[] _edge_lengths;
   delete _graph;
 
-  int nb_motions = 0;
+  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++;
     for(int m = 0; m < _nb_locations; m++) {
       if(_allowed_motion[l][m]) nb_motions++;
     }
   }
 
   int nb_vertices = 2 + 2 * _nb_time_steps * _nb_locations;
-  int nb_edges = _nb_locations * 2
-    + (_nb_time_steps - 1) * nb_motions
-    + _nb_locations * _nb_time_steps;
+
+  int nb_edges =
+    _nb_locations * 2 +
+    _nb_time_steps * (nb_exits + nb_entrances) +
+    (_nb_time_steps - 1) * nb_motions +
+    _nb_locations * _nb_time_steps;
 
   int source = 0, sink = nb_vertices - 1;
   int *node_from = new int[nb_edges];
@@ -117,6 +137,23 @@ void Tracker::build_graph() {
     }
   }
 
+  for(int t = 0; t < _nb_time_steps; t++) {
+    for(int l = 0; l < _nb_locations; l++) {
+      if(_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]) {
+        node_from[e] =   1 + (2 * (t + 0) + 1) * _nb_locations + l;
+        node_from[e] = sink;
+        _edge_lengths[e] = 0.0;
+        e++;
+      }
+    }
+  }
+
   _graph = new MTPGraph(nb_vertices, nb_edges,
                         node_from, node_to,
                         source, sink);
@@ -125,27 +162,20 @@ void Tracker::build_graph() {
   delete[] node_to;
 }
 
+void Tracker::print_dot_graph(ostream *os) {
+  _graph->print_dot(os);
+}
+
 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];
-      e++;
+      _edge_lengths[e++] = - _detection_score[t][l];
     }
   }
 
   _graph->find_best_paths(_edge_lengths);
   _graph->retrieve_disjoint_paths();
-
-  // 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->nodes[n];
-    // }
-    // cout << endl;
-  // }
-  // _graph->print_dot();
 }
 
 int Tracker::nb_trajectories() {