X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=tracker.cc;h=ad68c28855c0db77d2487fc26df0ec64d01341e8;hb=e9fbecf1c13c63a717c1b359c24287dbce23d4ed;hp=4b7375f26ffcf99d965f6bd5ac1a1f28af10aac5;hpb=8db91faf223fcb893b589c7b85d4ef5e03ffb6ce;p=mtp.git

diff --git a/tracker.cc b/tracker.cc
index 4b7375f..ad68c28 100644
--- 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;
     }
@@ -35,43 +40,54 @@ Tracker::Tracker(int nb_time_steps, int nb_locations) {
 
   _edge_lengths = 0;
   _graph = 0;
-  _edge_occupation = 0;
 }
 
 Tracker::~Tracker() {
   delete[] _edge_lengths;
   delete _graph;
-  delete[] _edge_occupation;
   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;
 }
 
 void Tracker::build_graph() {
-
   // Delete existing graph
   delete[] _edge_lengths;
-  delete[] _graph;
-  delete[] _edge_occupation;
+  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 - 2) * (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];
@@ -79,7 +95,6 @@ void Tracker::build_graph() {
   int e = 0;
 
   _edge_lengths = new scalar_t[nb_edges];
-  _edge_occupation = new int[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
@@ -93,7 +108,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;
@@ -121,6 +135,23 @@ void Tracker::build_graph() {
     }
   }
 
+  for(int t = 1; t < _nb_time_steps-1; 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_to[e] = sink;
+        _edge_lengths[e] = 0.0;
+        e++;
+      }
+    }
+  }
+
   _graph = new MTPGraph(nb_vertices, nb_edges,
                         node_from, node_to,
                         source, sink);
@@ -129,18 +160,22 @@ 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, _edge_occupation);
-  _graph->retrieve_paths();
+  _graph->find_best_paths(_edge_lengths);
+  _graph->retrieve_disjoint_paths();
 
+#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];
@@ -149,20 +184,17 @@ void Tracker::track() {
     }
     cout << endl;
   }
-  // _graph->print_dot();
+#endif
 }
 
-// void Tracker::track() {
-// }
-
-// int Tracker::nb_trajectories() {
-// }
-
-// int Tracker::trajectory_start_time(int k) {
-// }
+int Tracker::nb_trajectories() {
+  return _graph->nb_paths;
+}
 
-// int Tracker::trajectory_end_time(int k) {
-// }
+int Tracker::trajectory_duration(int k) {
+  return (_graph->paths[k]->length - 2) / 2;
+}
 
-// int Tracker::trajectory_location(int k, int time) {
-// }
+int Tracker::trajectory_location(int k, int time) {
+  return (_graph->paths[k]->nodes[2 * time + 1] - 1) % _nb_locations;
+}